From: Chuck Lever <chuck.lever@xxxxxxxxxx> These six patches are meant to replace: nfsd: factor out __fh_verify to allow NULL rqstp to be passed nfsd: add nfsd_file_acquire_local() I've removed the @nfs_vers parameter to __fh_verify(), and tried something a little different with the trace points. Please check my math. These have been compile-tested, but no more than that. Interested in comments. Chuck Lever (2): NFSD: Avoid using rqstp->rq_vers in nfsd_set_fh_dentry() NFSD: Short-circuit fh_verify tracepoints for LOCALIO NeilBrown (4): NFSD: Handle @rqstp == NULL in check_nfsd_access() NFSD: Refactor nfsd_setuser_and_check_port() nfsd: factor out __fh_verify to allow NULL rqstp to be passed nfsd: add nfsd_file_acquire_local() fs/nfsd/export.c | 29 ++++-- fs/nfsd/filecache.c | 61 +++++++++++-- fs/nfsd/filecache.h | 3 + fs/nfsd/lockd.c | 6 +- fs/nfsd/nfsfh.c | 210 ++++++++++++++++++++++++++------------------ fs/nfsd/nfsfh.h | 5 ++ fs/nfsd/trace.h | 18 ++-- 7 files changed, 223 insertions(+), 109 deletions(-) -- 2.45.2