VGhlIGZvbGxvd2luZyBuZnNkLXJlbGF0ZWQgY2hhbmdlcyBhcmUgYXZhaWxhYmxlIGZyb20gdGhl
IGZvci1saW51cwpicmFuY2ggb2YgdGhlIGdpdCByZXBvc2l0b3J5IGF0OgoKICBnaXQ6Ly9saW51
eC1uZnMub3JnL35iZmllbGRzL2xpbnV4LmdpdCBmb3ItbGludXMKCk5vdGhpbmcgZWFydGgtc2hh
dHRlcmluZzsgbW9zdGx5IG1pc2NlbGxhbmVvdXMgYnVnZml4ZXMgYW5kIGNsZWFudXAsIGZvcgps
b2NrZCBhbmQgbmZzZC4KCkplZmYgTGF5dG9uJ3MgY29udmVyc2lvbiBvZiBsb2NrZCBhbmQgdGhl
IE5GU3Y0IGNhbGxiYWNrIHNlcnZlciB0bwprdGhyZWFkcyBpcyBvbmUgb2YgdGhlIGxhcmdlciBw
aWVjZXMsIENodWNrIGRpZCBhIGJ1bmNoIG9mIGtjb25maWcKY2xlYW51cCwgZXRjLgoKLS1iLgoK
QWRyaWFuIEJ1bmsgKDEpOgogICAgICBtYWtlIG5mc2RfY3JlYXRlX3NldGF0dHIoKSBzdGF0aWMK
CkFuZHJldyBNb3J0b24gKDEpOgogICAgICBuZXQvc3VucnBjL3N2Yy5jOiBzdXBwcmVzcyB1bmlu
dGlhbGl6ZWQgdmFyIHdhcm5pbmcKCkF1csOpbGllbiBDaGFyYm9uICgxKToKICAgICAgSVB2NiBz
dXBwb3J0IGZvciBORlMgc2VydmVyIGV4cG9ydCBjYWNoZXMKCkNodWNrIExldmVyICgxMik6CiAg
ICAgIE5GU0Q6IFJlbW92ZSBORlNEX1RDUCBrZXJuZWwgYnVpbGQgb3B0aW9uCiAgICAgIE5GU0Q6
IFVwZGF0ZSBoZWxwIHRleHQgZm9yIENPTkZJR19ORlNECiAgICAgIE5GU0Q6IE1vdmUgInNlbGVj
dCBGU19QT1NJWF9BQ0wgaWYgTkZTRF9WNCIKICAgICAgTkZTRDogTW92ZSAic2VsZWN0IE5GU0Rf
VjJfQUNMIGlmIE5GU0RfVjNfQUNMIgogICAgICBORlNEOiBSZW1vdmUgcmVkdW5kYW50ICJzZWxl
Y3QiIGNsYXVzZXMgaW4gZnMvS2NvbmZpZwogICAgICBORlNEOiBVc2UgImRlcGVuZHMgb24iIGZv
ciBQUk9DX0ZTIGRlcGVuZGVuY3kKICAgICAgU1VOUlBDOiBSZW1vdmUgUFJPQ19GUyBkZXBlbmRl
bmN5CiAgICAgIE5GU0Q6IFJlbW92ZSBORlN2NCBkZXBlbmRlbmN5IG9uIE5GU3YzCiAgICAgIFNV
TlJQQzogUlBDIHNlcnZlciBzdGlsbCB1c2VzIDIuNCBtZXRob2QgZm9yIGRpc2FibGluZyBUQ1Ag
TmFnbGUKICAgICAgU1VOUlBDOiBVcGRhdGUgUlBDIHNlcnZlcidzIFRDUCByZWNvcmQgbWFya2Vy
IGRlY29kZXIKICAgICAgU1VOUlBDOiBVc2UgdW5zaWduZWQgaW5kZXggd2hlbiBsb29waW5nIG92
ZXIgYXJyYXlzCiAgICAgIFNVTlJQQzogVXNlIHVuc2lnbmVkIGxvb3AgYW5kIGFycmF5IGluZGV4
IGluIHN2Y19pbml0X2J1ZmZlcigpCgpGZWxpeCBCbHlha2hlciAoMSk6CiAgICAgIG5mc2Q6IGlu
aXRpYWxpemUgbGVhc2UgdHlwZSBpbiBuZnM0X29wZW5fZGVsZWdhdGlvbigpCgpIYXJzaHVsYSBK
YXlhc3VyaXlhICgxKToKICAgICAgc3VucnBjOiBHU1MgaW50ZWdyaXR5IGFuZCBkZWNyeXB0aW9u
IGZhaWx1cmVzIHNob3VsZCByZXR1cm4gR0FSQkFHRV9BUkdTCgpIYXJ2ZXkgSGFycmlzb24gKDMp
OgogICAgICBsb2NrZDogZml4IHNwYXJzZSB3YXJuaW5nIGluIHN2Y3NoYXJlLmMKICAgICAgbmZz
ZDogZml4IHNwYXJzZSB3YXJuaW5ncwogICAgICBuZnNkOiBmaXggc3BhcnNlIHdhcm5pbmcgaW4g
dmZzLmMKCkouIEJydWNlIEZpZWxkcyAoMTIpOgogICAgICBuZnM6IHJlbW92ZSB1bm5lY2Vzc2Fy
eSBORlNfTkVFRF8qIGRlZmluZXMKICAgICAgbmZzZDQ6IHJlbW92ZSB1bm5lY2Vzc2FyeSBDSEVD
S19GSCBjaGVjayBpbiBwcmVwcm9jZXNzX3NlcWlkX29wCiAgICAgIG5mc2Q0OiBzaW1wbGlmeSBz
dGF0ZWlkIHNlcXVlbmNpbmcgY2hlY2tzCiAgICAgIG5mc2Q0OiBraWxsIHVubmVjZXNzYXJ5IGNo
ZWNrIGluIHByZXByb2Nlc3Nfc3RhdGVpZF9vcAogICAgICBzdmNycGM6IG1vdmUgdW51c2VkIGZp
ZWxkIGZyb20gY2FjaGVfZGVmZXJyZWRfcmVxCiAgICAgIG5mc2Q6IGNsYXJpZnkgcmVhZGRpci9t
b3VudHBvaW50LWNyb3NzaW5nIGNvZGUKICAgICAgbG9ja2Q6IGZpeCByYWNlIGluIG5sbV9yZWxl
YXNlKCkKICAgICAgbG9ja2Q6IGNsZWFuIHVwIF9fbnNtX2ZpbmQoKQogICAgICBsb2NrZDogY29u
dmVydCBuc21fbXV0ZXggdG8gYSBzcGlubG9jawogICAgICBuZnNkOiBtb3ZlIG1vc3Qgb2YgZmhf
dmVyaWZ5IHRvIHNlcGFyYXRlIGZ1bmN0aW9uCiAgICAgIGxvY2tkOiBGaXggc3RhbGUgbmxtc3Zj
X3VubGlua19ibG9jayBjb21tZW50CiAgICAgIG5mc2Q6IGZpeCBjb21tZW50CgpKYW1lcyBMZW50
aW5pICgxKToKICAgICAgRG9jdW1lbnRhdGlvbjogTkZTL1JETUEgaW5zdHJ1Y3Rpb25zIGZvciAy
LjYuMjUtcmMxCgpKZWZmIExheXRvbiAoMTApOgogICAgICBTVU5SUEM6IGV4cG9ydCBzdmNfc29j
a191cGRhdGVfYnVmcwogICAgICBTVU5SUEM6IGhhdmUgc3ZjX3JlY3YoKSBjaGVjayBrdGhyZWFk
X3Nob3VsZF9zdG9wKCkKICAgICAgTkxNOiBDb252ZXJ0IGxvY2tkIHRvIHVzZSBrdGhyZWFkcwog
ICAgICBTVU5SUEM6IGFsbG93IHN2Y19yZWN2IHRvIGJyZWFrIG91dCBvZiA1MDBtcyBzbGVlcCB3
aGVuIGFsbG9jX3BhZ2UgZmFpbHMKICAgICAgTkZTOiBjb252ZXJ0IG5mczQgY2FsbGJhY2sgdGhy
ZWFkIHRvIGt0aHJlYWQgQVBJCiAgICAgIFNVTlJQQzogcmVtb3ZlIHN2Y19jcmVhdGVfdGhyZWFk
KCkKICAgICAgTkZTOiBkb24ndCBsZXQgbmZzX2NhbGxiYWNrX3N2YyBleGl0IG9uIHVuZXhwZWN0
ZWQgc3ZjX3JlY3YgZXJyb3JzICh0cnkgIzIpCiAgICAgIE5MTTogZG9uJ3QgbGV0IGxvY2tkIGV4
aXQgb24gdW5leHBlY3RlZCBzdmNfcmVjdiBlcnJvcnMgKHRyeSAjMikKICAgICAga25mc2Q6IGdl
dCByaWQgb2YgaW1vZGUgdmFyaWFibGUgaW4gbmZzZF9zZXRhdHRyCiAgICAgIGtuZnNkOiBjbGVh
ciBib3RoIHNldHVpZCBhbmQgc2V0Z2lkIHdoZW5ldmVyIGEgY2hvd24gaXMgZG9uZQoKS2V2aW4g
Q29mZm1hbiAoNCk6CiAgICAgIENvcnJlY3QgZ3JhbW1lci90eXBvcyBpbiBkcHJpbnRrcwogICAg
ICBSZW1vdmUgZGVmaW5lIGZvciBLUkI1X0NLU1VNX0xFTkdUSCwgd2hpY2ggd2lsbCBiZWNvbWUg
ZW5jdHlwZS1kZXBlbmRlbnQKICAgICAgZ3NzX2tyYjU6IGNvbnNpc3RlbnRseSB1c2UgdW5zaWdu
ZWQgZm9yIHNlcW51bQogICAgICBzdW5ycGM6IG1ha2UgdG9rZW4gaGVhZGVyIHZhbHVlcyBsZXNz
IGNvbmZ1c2luZwoKTmVpbEJyb3duICgxKToKICAgICAga25mc2Q6IFJlbW92ZSBOTE1fSE9TVF9N
QVggYW5kIGFzc29jaWF0ZWQgbG9naWMuCgpPbGdhIEtvcm5pZXZza2FpYSAoMSk6CiAgICAgIG5m
c2Q6IHVzZSBzdGF0aWMgbWVtb3J5IGZvciBjYWxsYmFjayBwcm9ncmFtIGFuZCBzdGF0cwoKUm9i
ZXJ0IFAuIEouIERheSAoMSk6CiAgICAgIE5GU0Q6IFN0cmlwIF9fS0VSTkVMX18gdGVzdGluZyBm
cm9tIHVuZXhwb3J0ZWQgaGVhZGVyIGZpbGVzLgoKU3RldmVuIFdoaXRlaG91c2UgKDEpOgogICAg
ICBVc2UgYSB6ZXJvIHNpemVkIGFycmF5IGZvciByYXcgZmllbGQgaW4gc3RydWN0IGZpZAoKVG9t
IFR1Y2tlciAoMSk6CiAgICAgIFNWQ1JETUE6IEFkZCBjaGVjayBmb3IgWFBUX0NMT1NFIGluIHN2
Y19yZG1hX3NlbmQKCiBEb2N1bWVudGF0aW9uL2ZpbGVzeXN0ZW1zL25mcy1yZG1hLnR4dCAgIHwg
IDI1MiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGZzL0tjb25maWcgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgfCAgMTA5ICsrKysrKystLS0tLS0KIGZzL2xvY2tkL2hvc3Qu
YyAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDczICsrKysrLS0tLS0KIGZzL2xvY2tkL3N2
Yy5jICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMTUwICsrKysrKysrLS0tLS0tLS0tLQog
ZnMvbG9ja2Qvc3ZjbG9jay5jICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDYgKy0KIGZzL2xv
Y2tkL3N2Y3NoYXJlLmMgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICstCiBmcy9uZnMvY2Fs
bGJhY2suYyAgICAgICAgICAgICAgICAgICAgICAgIHwgICA5MyArKysrKystLS0tLS0KIGZzL25m
cy9zeW1saW5rLmMgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAxIC0KIGZzL25mc2QvYXV0
aC5jICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAxICsKIGZzL25mc2QvZXhwb3J0LmMg
ICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA5ICstCiBmcy9uZnNkL25mczRjYWxsYmFjay5j
ICAgICAgICAgICAgICAgICAgIHwgICAyOCArKy0tCiBmcy9uZnNkL25mczRpZG1hcC5jICAgICAg
ICAgICAgICAgICAgICAgIHwgICAgMiArLQogZnMvbmZzZC9uZnM0c3RhdGUuYyAgICAgICAgICAg
ICAgICAgICAgICB8ICAgNzEgKysrKystLS0tCiBmcy9uZnNkL25mczR4ZHIuYyAgICAgICAgICAg
ICAgICAgICAgICAgIHwgICAxMyArKy0KIGZzL25mc2QvbmZzY3RsLmMgICAgICAgICAgICAgICAg
ICAgICAgICAgfCAgIDIyICsrLQogZnMvbmZzZC9uZnNmaC5jICAgICAgICAgICAgICAgICAgICAg
ICAgICB8ICAyMjggKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogZnMvbmZzZC9uZnNzdmMu
YyAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDIgLQogZnMvbmZzZC92ZnMuYyAgICAgICAg
ICAgICAgICAgICAgICAgICAgICB8ICAgMzUgKystLQogaW5jbHVkZS9saW51eC9leHBvcnRmcy5o
ICAgICAgICAgICAgICAgICB8ICAgIDIgKy0KIGluY2x1ZGUvbGludXgvbmZzMy5oICAgICAgICAg
ICAgICAgICAgICAgfCAgICAyICstCiBpbmNsdWRlL2xpbnV4L25mc2QvS2J1aWxkICAgICAgICAg
ICAgICAgIHwgICAgNCArLQogaW5jbHVkZS9saW51eC9uZnNkL2NhY2hlLmggICAgICAgICAgICAg
ICB8ICAgIDIgLQogaW5jbHVkZS9saW51eC9uZnNkL25mc2QuaCAgICAgICAgICAgICAgICB8ICAg
MTEgKy0KIGluY2x1ZGUvbGludXgvc3VucnBjL2NhY2hlLmggICAgICAgICAgICAgfCAgICAxIC0K
IGluY2x1ZGUvbGludXgvc3VucnBjL2dzc19rcmI1LmggICAgICAgICAgfCAgICA2ICstCiBpbmNs
dWRlL2xpbnV4L3N1bnJwYy9zdmMuaCAgICAgICAgICAgICAgIHwgICAgMSAtCiBpbmNsdWRlL2xp
bnV4L3N1bnJwYy9zdmNhdXRoLmggICAgICAgICAgIHwgICAgNSArLQogaW5jbHVkZS9saW51eC9z
dW5ycGMvc3Zjc29jay5oICAgICAgICAgICB8ICAgIDQgKy0KIGluY2x1ZGUvbmV0L2lwdjYuaCAg
ICAgICAgICAgICAgICAgICAgICAgfCAgICA5ICsKIG5ldC9zdW5ycGMvYXV0aF9nc3MvZ3NzX2dl
bmVyaWNfdG9rZW4uYyAgfCAgICA0ICstCiBuZXQvc3VucnBjL2F1dGhfZ3NzL2dzc19rcmI1X2Ny
eXB0by5jICAgIHwgICAgNiArLQogbmV0L3N1bnJwYy9hdXRoX2dzcy9nc3Nfa3JiNV9zZWFsLmMg
ICAgICB8ICAgIDkgKy0KIG5ldC9zdW5ycGMvYXV0aF9nc3MvZ3NzX2tyYjVfc2VxbnVtLmMgICAg
fCAgICA0ICstCiBuZXQvc3VucnBjL2F1dGhfZ3NzL2dzc19rcmI1X3Vuc2VhbC5jICAgIHwgICAg
MiArLQogbmV0L3N1bnJwYy9hdXRoX2dzcy9nc3Nfa3JiNV93cmFwLmMgICAgICB8ICAgIDggKy0K
IG5ldC9zdW5ycGMvYXV0aF9nc3MvZ3NzX3Nwa20zX3NlYWwuYyAgICAgfCAgICA0ICstCiBuZXQv
c3VucnBjL2F1dGhfZ3NzL3N2Y2F1dGhfZ3NzLmMgICAgICAgIHwgICAgOSArLQogbmV0L3N1bnJw
Yy9jYWNoZS5jICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDEgLQogbmV0L3N1bnJwYy9zdmMu
YyAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjUgKy0tCiBuZXQvc3VucnBjL3N2Y194cHJ0
LmMgICAgICAgICAgICAgICAgICAgIHwgICAzMCArKystCiBuZXQvc3VucnBjL3N2Y2F1dGhfdW5p
eC5jICAgICAgICAgICAgICAgIHwgIDExOCArKysrKysrKysrLS0tLS0KIG5ldC9zdW5ycGMvc3Zj
c29jay5jICAgICAgICAgICAgICAgICAgICAgfCAgIDI5ICsrLS0KIG5ldC9zdW5ycGMveHBydHJk
bWEvc3ZjX3JkbWFfdHJhbnNwb3J0LmMgfCAgICAyICsKIDQzIGZpbGVzIGNoYW5nZWQsIDg3OSBp
bnNlcnRpb25zKCspLCA1MTcgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgRG9jdW1l
bnRhdGlvbi9maWxlc3lzdGVtcy9uZnMtcmRtYS50eHQKX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX18KTkZTdjQgbWFpbGluZyBsaXN0Ck5GU3Y0QGxpbnV4LW5m
cy5vcmcKaHR0cDovL2xpbnV4LW5mcy5vcmcvY2dpLWJpbi9tYWlsbWFuL2xpc3RpbmZvL25mc3Y0
A few more nfsd-related changes are available in the git repository at:
git://linux-nfs.org/~bfields/linux.git for-linus
Mainly this adds a couple new interfaces from Wendy Cheng which allow
userland to tell the nfs server to drop locks held on a given filesystem
(or held by clients accessing the server via a given server ip address),
helpful in high-availability setups when taking down a server whose job
is being taken over by another.
(This could have probably gone with the first pull request, but the
patches were still getting a little work--a small bugfix, and some
fiddling with function names and such.)
The rest are miscellaneous minor bugfixes and cleanup.
--b.
David M. Richter (4):
leases: fix a return-value mixup
leases: when unlocking, skip locking-related steps
leases: move lock allocation earlier in generic_setlease()
leases: remove unneeded variable from fcntl_setlease().
J. Bruce Fields (2):
locks: don't call ->copy_lock methods on return of conflicting locks
nfsd: don't allow setting ctime over v4
James Lentini (1):
Update to NFS/RDMA documentation
Wendy Cheng (2):
lockd: unlock lockd locks associated with a given server ip
lockd: unlock lockd locks held for a certain filesystem
Documentation/filesystems/nfs-rdma.txt | 14 ++++--
fs/lockd/svclock.c | 2 +-
fs/lockd/svcsubs.c | 69 ++++++++++++++++++++++++++++----
fs/locks.c | 32 ++++++++-------
fs/nfsd/nfs4state.c | 3 -
fs/nfsd/nfs4xdr.c | 14 ------
fs/nfsd/nfsctl.c | 65 ++++++++++++++++++++++++++++++
include/linux/fs.h | 1 +
include/linux/lockd/lockd.h | 8 +++-
include/linux/nfsd/nfsd.h | 2 +-
10 files changed, 162 insertions(+), 48 deletions(-)
_______________________________________________
NFSv4 mailing list
[email protected]
http://linux-nfs.org/cgi-bin/mailman/listinfo/nfsv4