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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html