From: Chuck Lever <chuck.lever@xxxxxxxxxx> Address an NFSD crasher that was noted here: https://lore.kernel.org/linux-nfs/65ee9c0d-e89e-b3e5-f542-103a0ee4745c@xxxxxxxxxxxxxxx/ To apply the fix cleanly, backport a few NFSD patches into v6.1.y that have been in the other LTS kernels for a while. Reported-by: Li LingFeng <lilingfeng3@xxxxxxxxxx> Suggested-by: Li LingFeng <lilingfeng3@xxxxxxxxxx> Tested-by: Li LingFeng <lilingfeng3@xxxxxxxxxx> Jeff Layton (1): nfsd: drop the nfsd_put helper NeilBrown (5): nfsd: Simplify code around svc_exit_thread() call in nfsd() nfsd: separate nfsd_last_thread() from nfsd_put() NFSD: simplify error paths in nfsd_svc() nfsd: call nfsd_last_thread() before final nfsd_put() nfsd: don't call locks_release_private() twice concurrently Trond Myklebust (1): nfsd: Fix a regression in nfsd_setattr() fs/nfsd/nfs4proc.c | 4 ++ fs/nfsd/nfs4state.c | 2 +- fs/nfsd/nfsctl.c | 32 ++++++++------ fs/nfsd/nfsd.h | 3 +- fs/nfsd/nfssvc.c | 85 ++++++++++---------------------------- fs/nfsd/vfs.c | 6 ++- include/linux/sunrpc/svc.h | 13 ------ 7 files changed, 51 insertions(+), 94 deletions(-) -- 2.45.1