nfsd: reorganize filecache.c

In a coming patch, we're going to rework how the filecache refcounting
works. Move some code around in the function to reduce the churn in the
later patches, and rename some of the functions with (hopefully) clearer
names: nfsd_file_flush becomes nfsd_file_fsync, and
nfsd_file_unhash_and_dispose is renamed to nfsd_file_unhash_and_queue.

Also, the nfsd_file_put_final tracepoint is renamed to nfsd_file_free,
to better match the name of the function from which it's called.

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

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index 2d543a4..1418bc8 100644 (file)
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -335,16 +335,59 @@ nfsd_file_alloc(struct nfsd_file_lookup_key *key, unsigned int may)
        return nf;
 }
 
+static void
+nfsd_file_fsync(struct nfsd_file *nf)
+{
+       struct file *file = nf->nf_file;
+
+       if (!file || !(file->f_mode & FMODE_WRITE))
+               return;
+       if (vfs_fsync(file, 1) != 0)
+               nfsd_reset_write_verifier(net_generic(nf->nf_net, nfsd_net_id));
+}
+
+static int
+nfsd_file_check_write_error(struct nfsd_file *nf)
+{
+       struct file *file = nf->nf_file;
+
+       if (!file || !(file->f_mode & FMODE_WRITE))
+               return 0;
+       return filemap_check_wb_err(file->f_mapping, READ_ONCE(file->f_wb_err));
+}
+
+static void
+nfsd_file_hash_remove(struct nfsd_file *nf)
+{
+       trace_nfsd_file_unhash(nf);
+
+       if (nfsd_file_check_write_error(nf))
+               nfsd_reset_write_verifier(net_generic(nf->nf_net, nfsd_net_id));
+       rhashtable_remove_fast(&nfsd_file_rhash_tbl, &nf->nf_rhash,
+                              nfsd_file_rhash_params);
+}
+
+static bool
+nfsd_file_unhash(struct nfsd_file *nf)
+{
+       if (test_and_clear_bit(NFSD_FILE_HASHED, &nf->nf_flags)) {
+               nfsd_file_hash_remove(nf);
+               return true;
+       }
+       return false;
+}
+
 static bool
 nfsd_file_free(struct nfsd_file *nf)
 {
        s64 age = ktime_to_ms(ktime_sub(ktime_get(), nf->nf_birthtime));
        bool flush = false;
 
+       trace_nfsd_file_free(nf);
+
        this_cpu_inc(nfsd_file_releases);
        this_cpu_add(nfsd_file_total_age, age);
 
-       trace_nfsd_file_put_final(nf);
        if (nf->nf_mark)
                nfsd_file_mark_put(nf->nf_mark);
        if (nf->nf_file) {
@@ -378,27 +421,6 @@ nfsd_file_check_writeback(struct nfsd_file *nf)
                mapping_tagged(mapping, PAGECACHE_TAG_WRITEBACK);
 }
 
-static int
-nfsd_file_check_write_error(struct nfsd_file *nf)
-{
-       struct file *file = nf->nf_file;
-
-       if (!file || !(file->f_mode & FMODE_WRITE))
-               return 0;
-       return filemap_check_wb_err(file->f_mapping, READ_ONCE(file->f_wb_err));
-}
-
-static void
-nfsd_file_flush(struct nfsd_file *nf)
-{
-       struct file *file = nf->nf_file;
-
-       if (!file || !(file->f_mode & FMODE_WRITE))
-               return;
-       if (vfs_fsync(file, 1) != 0)
-               nfsd_reset_write_verifier(net_generic(nf->nf_net, nfsd_net_id));
-}
-
 static void nfsd_file_lru_add(struct nfsd_file *nf)
 {
        set_bit(NFSD_FILE_REFERENCED, &nf->nf_flags);
@@ -412,31 +434,18 @@ static void nfsd_file_lru_remove(struct nfsd_file *nf)
                trace_nfsd_file_lru_del(nf);
 }
 
-static void
-nfsd_file_hash_remove(struct nfsd_file *nf)
-{
-       trace_nfsd_file_unhash(nf);
-
-       if (nfsd_file_check_write_error(nf))
-               nfsd_reset_write_verifier(net_generic(nf->nf_net, nfsd_net_id));
-       rhashtable_remove_fast(&nfsd_file_rhash_tbl, &nf->nf_rhash,
-                              nfsd_file_rhash_params);
-}
-
-static bool
-nfsd_file_unhash(struct nfsd_file *nf)
+struct nfsd_file *
+nfsd_file_get(struct nfsd_file *nf)
 {
-       if (test_and_clear_bit(NFSD_FILE_HASHED, &nf->nf_flags)) {
-               nfsd_file_hash_remove(nf);
-               return true;
-       }
-       return false;
+       if (likely(refcount_inc_not_zero(&nf->nf_ref)))
+               return nf;
+       return NULL;
 }
 
 static void
-nfsd_file_unhash_and_dispose(struct nfsd_file *nf, struct list_head *dispose)
+nfsd_file_unhash_and_queue(struct nfsd_file *nf, struct list_head *dispose)
 {
-       trace_nfsd_file_unhash_and_dispose(nf);
+       trace_nfsd_file_unhash_and_queue(nf);
        if (nfsd_file_unhash(nf)) {
                /* caller must call nfsd_file_dispose_list() later */
                nfsd_file_lru_remove(nf);
@@ -474,7 +483,7 @@ nfsd_file_put(struct nfsd_file *nf)
                nfsd_file_unhash_and_put(nf);
 
        if (!test_bit(NFSD_FILE_HASHED, &nf->nf_flags)) {
-               nfsd_file_flush(nf);
+               nfsd_file_fsync(nf);
                nfsd_file_put_noref(nf);
        } else if (nf->nf_file && test_bit(NFSD_FILE_GC, &nf->nf_flags)) {
                nfsd_file_put_noref(nf);
@@ -483,14 +492,6 @@ nfsd_file_put(struct nfsd_file *nf)
                nfsd_file_put_noref(nf);
 }
 
-struct nfsd_file *
-nfsd_file_get(struct nfsd_file *nf)
-{
-       if (likely(refcount_inc_not_zero(&nf->nf_ref)))
-               return nf;
-       return NULL;
-}
-
 static void
 nfsd_file_dispose_list(struct list_head *dispose)
 {
@@ -499,7 +500,7 @@ nfsd_file_dispose_list(struct list_head *dispose)
        while(!list_empty(dispose)) {
                nf = list_first_entry(dispose, struct nfsd_file, nf_lru);
                list_del_init(&nf->nf_lru);
-               nfsd_file_flush(nf);
+               nfsd_file_fsync(nf);
                nfsd_file_put_noref(nf);
        }
 }
@@ -513,7 +514,7 @@ nfsd_file_dispose_list_sync(struct list_head *dispose)
        while(!list_empty(dispose)) {
                nf = list_first_entry(dispose, struct nfsd_file, nf_lru);
                list_del_init(&nf->nf_lru);
-               nfsd_file_flush(nf);
+               nfsd_file_fsync(nf);
                if (!refcount_dec_and_test(&nf->nf_ref))
                        continue;
                if (nfsd_file_free(nf))
@@ -713,7 +714,7 @@ __nfsd_file_close_inode(struct inode *inode, struct list_head *dispose)
                                       nfsd_file_rhash_params);
                if (!nf)
                        break;
-               nfsd_file_unhash_and_dispose(nf, dispose);
+               nfsd_file_unhash_and_queue(nf, dispose);
                count++;
        } while (1);
        rcu_read_unlock();
@@ -915,7 +916,7 @@ __nfsd_file_cache_purge(struct net *net)
                nf = rhashtable_walk_next(&iter);
                while (!IS_ERR_OR_NULL(nf)) {
                        if (!net || nf->nf_net == net)
-                               nfsd_file_unhash_and_dispose(nf, &dispose);
+                               nfsd_file_unhash_and_queue(nf, &dispose);
                        nf = rhashtable_walk_next(&iter);
                }
 

diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index b648db4..0177cfa 100644 (file)
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -906,10 +906,10 @@ DEFINE_EVENT(nfsd_file_class, name, \
        TP_PROTO(struct nfsd_file *nf), \
        TP_ARGS(nf))
 
-DEFINE_NFSD_FILE_EVENT(nfsd_file_put_final);
+DEFINE_NFSD_FILE_EVENT(nfsd_file_free);
 DEFINE_NFSD_FILE_EVENT(nfsd_file_unhash);
 DEFINE_NFSD_FILE_EVENT(nfsd_file_put);
-DEFINE_NFSD_FILE_EVENT(nfsd_file_unhash_and_dispose);
+DEFINE_NFSD_FILE_EVENT(nfsd_file_unhash_and_queue);
 
 TRACE_EVENT(nfsd_file_alloc,
        TP_PROTO(