Please pull nfsd bugfixes from: git://linux-nfs.org/~bfields/linux.git tags/nfsd-5.1-1 Fix miscellaneous nfsd bugs, in NFSv4.1 callbacks, NFSv4.1 lock-notification callbacks, NFSv3 readdir encoding, and the cache/upcall code. --b. Jeff Layton (2): nfsd: wake waiters blocked on file_lock before deleting it nfsd: wake blocked file lock waiters before sending callback Murphy Zhou (1): nfsd/nfsd3_proc_readdir: fix buffer count and page pointers NeilBrown (1): sunrpc: don't mark uninitialised items as VALID. Trond Myklebust (1): nfsd: Don't release the callback slot unless it was actually held fs/nfsd/nfs3proc.c | 17 +++++++++++++++-- fs/nfsd/nfs3xdr.c | 11 +++++++++-- fs/nfsd/nfs4callback.c | 8 +++++++- fs/nfsd/nfs4state.c | 12 ++++++++++-- fs/nfsd/state.h | 1 + net/sunrpc/cache.c | 3 +++ 6 files changed, 45 insertions(+), 7 deletions(-)