NFSD: Clean up nfsd_vfs_write()

[ Upstream commit 33388b3aefefd4d83764dab8038cb54068161a44 ]

The RWF_SYNC and !RWF_SYNC arms are now exactly alike except that
the RWF_SYNC arm resets the boot verifier twice in a row. Fix that
redundancy and de-duplicate the code.

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

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index bc025fe5a595b4cb711d8afddde50207f4b51af3..98d370dcca867f817ff042a6074144e976f7a63f 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -1009,22 +1009,11 @@ 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 (flags & RWF_SYNC) {
-               if (verf)
-                       nfsd_copy_boot_verifier(verf,
-                                       net_generic(SVC_NET(rqstp),
-                                       nfsd_net_id));
-               host_err = vfs_iter_write(file, &iter, &pos, flags);
-               if (host_err < 0)
-                       nfsd_reset_boot_verifier(net_generic(SVC_NET(rqstp),
-                                                nfsd_net_id));
-       } else {
-               if (verf)
-                       nfsd_copy_boot_verifier(verf,
-                                       net_generic(SVC_NET(rqstp),
-                                       nfsd_net_id));
-               host_err = vfs_iter_write(file, &iter, &pos, flags);
-       }
+       if (verf)
+               nfsd_copy_boot_verifier(verf,
+                               net_generic(SVC_NET(rqstp),
+                               nfsd_net_id));
+       host_err = vfs_iter_write(file, &iter, &pos, flags);
        if (host_err < 0) {
                nfsd_reset_boot_verifier(net_generic(SVC_NET(rqstp),
                                         nfsd_net_id));