I'm proposing this series as the first NFSD-related patchset to go into v6.2 (for-next), though I haven't opened that yet. For quite some time, we've been encouraged to disable filecache garbage collection for NFSv4 files, and I think I found a surgical way to do just that. That is presented in "NFSD: Add an NFSD_FILE_GC flag to enable nfsd_file garbage collection". To make that fit, I've dropped Jeff's fix for nfsd_file_close(), but incorporated his proposed replacement logic into nfsd_file_put(). The justification for that can be found in the patch descriptions. Jeff's other two patches are included here because I intend to get them merged into v6.1 soon thus they will become part of the base for NFSD for-next. For the moment I'm leaving out Fixes tags because I'd like to see these get some testing before they are applied to v6.0 -- and again, we're not yet 100% sure these fix a misbehavior that has been hit in the field. Comments and opinions are welcome. --- Chuck Lever (7): NFSD: Pass the target nfsd_file to nfsd_commit() NFSD: Revert "NFSD: NFSv4 CLOSE should release an nfsd_file immediately" NFSD: Add an NFSD_FILE_GC flag to enable nfsd_file garbage collection NFSD: Use const pointers as parameters to fh_ helpers. NFSD: Use rhashtable for managing nfs4_file objects NFSD: Clean up nfs4_preprocess_stateid_op() call sites NFSD: Trace delegation revocations Jeff Layton (2): nfsd: fix nfsd_file_unhash_and_dispose nfsd: rework hashtable handling in nfsd_do_file_acquire fs/nfsd/filecache.c | 165 ++++++++++++++++--------------- fs/nfsd/filecache.h | 4 +- fs/nfsd/nfs3proc.c | 10 +- fs/nfsd/nfs4proc.c | 42 ++++---- fs/nfsd/nfs4state.c | 235 ++++++++++++++++++++++++++++++-------------- fs/nfsd/nfsfh.h | 10 +- fs/nfsd/state.h | 5 +- fs/nfsd/trace.h | 58 ++++++++++- fs/nfsd/vfs.c | 19 ++-- fs/nfsd/vfs.h | 3 +- 10 files changed, 344 insertions(+), 207 deletions(-) -- Chuck Lever