Please pull:
git://linux-nfs.org/~bfields/linux.git tags/nfsd-4.10-2
----------------------------------------------------------------
Three more miscellaneous nfsd bugfixes.
----------------------------------------------------------------
Christoph Hellwig (1):
nfsd: special case truncates some more
J. Bruce Fields (1):
svcrpc: fix oops in absence of krb5 module
Kinglong Mee (1):
NFSD: Fix a null reference case in find_or_create_lock_stateid()
fs/nfsd/nfs4layouts.c | 5 +-
fs/nfsd/nfs4state.c | 19 ++++----
fs/nfsd/state.h | 4 +-
fs/nfsd/vfs.c | 97 +++++++++++++++------------------------
net/sunrpc/auth_gss/gss_rpc_xdr.c | 2 +-
5 files changed, 51 insertions(+), 76 deletions(-)
