NFSD: Rename boot verifier functions

Clean up: These functions handle what the specs call a write
verifier, which in the Linux NFS server implementation is now
divorced from the server's boot instance

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
index e2904540e463c812d9a1d30bccd2349315f024c6..8bc807c5fea4cfd8232e3d2140e71449fb0af8a3 100644 (file)
--- a/fs/nfsd/filecache.c
+++ b/fs/nfsd/filecache.c
@@ -243,7 +243,7 @@ nfsd_file_do_unhash(struct nfsd_file *nf)
        trace_nfsd_file_unhash(nf);
 
        if (nfsd_file_check_write_error(nf))
-               nfsd_reset_boot_verifier(net_generic(nf->nf_net, nfsd_net_id));
+               nfsd_reset_write_verifier(net_generic(nf->nf_net, nfsd_net_id));
        --nfsd_file_hashtbl[nf->nf_hashval].nfb_count;
        hlist_del_rcu(&nf->nf_node);
        atomic_long_dec(&nfsd_filecache_count);

diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index a6ed3002598494e360630b7b26b803f20b9c73d0..1b1a962a18041c53021b26d8331fbf196679fcc6 100644 (file)
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -198,6 +198,6 @@ extern void nfsd_netns_free_versions(struct nfsd_net *nn);
 
 extern unsigned int nfsd_net_id;
 
-void nfsd_copy_boot_verifier(__be32 verf[2], struct nfsd_net *nn);
-void nfsd_reset_boot_verifier(struct nfsd_net *nn);
+void nfsd_copy_write_verifier(__be32 verf[2], struct nfsd_net *nn);
+void nfsd_reset_write_verifier(struct nfsd_net *nn);
 #endif /* __NFSD_NETNS_H__ */

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 43057080d2aa5eb9c285f39cf444d4404b8dbc7c..6f53eb90c6b44ffac02de4425783d317199bf2c8 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -598,7 +598,7 @@ static void gen_boot_verifier(nfs4_verifier *verifier, struct net *net)
 
        BUILD_BUG_ON(2*sizeof(*verf) != sizeof(verifier->data));
 
-       nfsd_copy_boot_verifier(verf, net_generic(net, nfsd_net_id));
+       nfsd_copy_write_verifier(verf, net_generic(net, nfsd_net_id));
 }
 
 static __be32

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 81d47049588f22ca936ad45f916c8eba7a326142..07193595b8e0aa030e99177551bdd868c7439ea0 100644 (file)
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -346,14 +346,14 @@ static bool nfsd_needs_lockd(struct nfsd_net *nn)
 }
 
 /**
- * nfsd_copy_boot_verifier - Atomically copy a write verifier
+ * nfsd_copy_write_verifier - Atomically copy a write verifier
  * @verf: buffer in which to receive the verifier cookie
  * @nn: NFS net namespace
  *
  * This function provides a wait-free mechanism for copying the
- * namespace's boot verifier without tearing it.
+ * namespace's write verifier without tearing it.
  */
-void nfsd_copy_boot_verifier(__be32 verf[2], struct nfsd_net *nn)
+void nfsd_copy_write_verifier(__be32 verf[2], struct nfsd_net *nn)
 {
        int seq = 0;
 
@@ -364,7 +364,7 @@ void nfsd_copy_boot_verifier(__be32 verf[2], struct nfsd_net *nn)
        done_seqretry(&nn->writeverf_lock, seq);
 }
 
-static void nfsd_reset_boot_verifier_locked(struct nfsd_net *nn)
+static void nfsd_reset_write_verifier_locked(struct nfsd_net *nn)
 {
        struct timespec64 now;
        u64 verf;
@@ -379,7 +379,7 @@ static void nfsd_reset_boot_verifier_locked(struct nfsd_net *nn)
 }
 
 /**
- * nfsd_reset_boot_verifier - Generate a new boot verifier
+ * nfsd_reset_write_verifier - Generate a new write verifier
  * @nn: NFS net namespace
  *
  * This function updates the ->writeverf field of @nn. This field
@@ -391,10 +391,10 @@ static void nfsd_reset_boot_verifier_locked(struct nfsd_net *nn)
  * server and MUST be unique between instances of the NFSv4.1
  * server."
  */
-void nfsd_reset_boot_verifier(struct nfsd_net *nn)
+void nfsd_reset_write_verifier(struct nfsd_net *nn)
 {
        write_seqlock(&nn->writeverf_lock);
-       nfsd_reset_boot_verifier_locked(nn);
+       nfsd_reset_write_verifier_locked(nn);
        write_sequnlock(&nn->writeverf_lock);
 }
 
@@ -683,7 +683,7 @@ int nfsd_create_serv(struct net *net)
                register_inet6addr_notifier(&nfsd_inet6addr_notifier);
 #endif
        }
-       nfsd_reset_boot_verifier(nn);
+       nfsd_reset_write_verifier(nn);
        return 0;
 }
 

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 70ea7e0aae07347651c071e909aa79a6e0ae6c48..49564457bd3d899039885b238f439a5c4d8cae25 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -559,8 +559,8 @@ __be32 nfsd4_clone_file_range(struct svc_rqst *rqstp,
                                        &nfsd4_get_cstate(rqstp)->current_fh,
                                        dst_pos,
                                        count, status);
-                       nfsd_reset_boot_verifier(net_generic(nf_dst->nf_net,
-                                                nfsd_net_id));
+                       nfsd_reset_write_verifier(net_generic(nf_dst->nf_net,
+                                                 nfsd_net_id));
                        ret = nfserrno(status);
                }
        }
@@ -1013,10 +1013,10 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
        iov_iter_kvec(&iter, WRITE, vec, vlen, *cnt);
        since = READ_ONCE(file->f_wb_err);
        if (verf)
-               nfsd_copy_boot_verifier(verf, nn);
+               nfsd_copy_write_verifier(verf, nn);
        host_err = vfs_iter_write(file, &iter, &pos, flags);
        if (host_err < 0) {
-               nfsd_reset_boot_verifier(nn);
+               nfsd_reset_write_verifier(nn);
                goto out_nfserr;
        }
        *cnt = host_err;
@@ -1029,7 +1029,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
        if (stable && use_wgather) {
                host_err = wait_for_concurrent_writes(file);
                if (host_err < 0)
-                       nfsd_reset_boot_verifier(nn);
+                       nfsd_reset_write_verifier(nn);
        }
 
 out_nfserr:
@@ -1142,7 +1142,7 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp,
                err2 = vfs_fsync_range(nf->nf_file, offset, end, 0);
                switch (err2) {
                case 0:
-                       nfsd_copy_boot_verifier(verf, nn);
+                       nfsd_copy_write_verifier(verf, nn);
                        err2 = filemap_check_wb_err(nf->nf_file->f_mapping,
                                                    since);
                        break;
@@ -1150,11 +1150,11 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp,
                        err = nfserr_notsupp;
                        break;
                default:
-                       nfsd_reset_boot_verifier(nn);
+                       nfsd_reset_write_verifier(nn);
                }
                err = nfserrno(err2);
        } else
-               nfsd_copy_boot_verifier(verf, nn);
+               nfsd_copy_write_verifier(verf, nn);
 
        nfsd_file_put(nf);
 out: