nfsd: NFSD_FILE_KEY_INODE only needs to find GC'ed entries

Since v4 files are expected to be long-lived, there's little value in
closing them out of the cache when there is conflicting access.

Change the comparator to also match the gc value in the key. Change both
of the current users of that key to set the gc value in the key to
"true".

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index 5b5d39e..c36e303 100644 (file)
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -175,6 +175,8 @@ static int nfsd_file_obj_cmpfn(struct rhashtable_compare_arg *arg,
 
        switch (key->type) {
        case NFSD_FILE_KEY_INODE:
+               if (test_bit(NFSD_FILE_GC, &nf->nf_flags) != key->gc)
+                       return 1;
                if (nf->nf_inode != key->inode)
                        return 1;
                break;
@@ -695,6 +697,7 @@ nfsd_file_queue_for_close(struct inode *inode, struct list_head *dispose)
        struct nfsd_file_lookup_key key = {
                .type   = NFSD_FILE_KEY_INODE,
                .inode  = inode,
+               .gc     = true,
        };
        struct nfsd_file *nf;
 
@@ -1049,6 +1052,7 @@ nfsd_file_is_cached(struct inode *inode)
        struct nfsd_file_lookup_key key = {
                .type   = NFSD_FILE_KEY_INODE,
                .inode  = inode,
+               .gc     = true,
        };
        bool ret = false;