NFSD: restore EINVAL error translation in nfsd_commit()

[mirror_ubuntu-jammy-kernel.git] / fs / nfsd / vfs.c

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 738d564ca4ce34c36339f03bec279cb3b64cc4cf..4949f4a8cd4740e42ebe29d7eb0a6e3ed5495e05 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -433,6 +433,10 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp, struct iattr *iap,
                        .ia_size        = iap->ia_size,
                };
 
+               host_err = -EFBIG;
+               if (iap->ia_size < 0)
+                       goto out_unlock;
+
                host_err = notify_change(&init_user_ns, dentry, &size_attr, NULL);
                if (host_err)
                        goto out_unlock;
@@ -521,10 +525,11 @@ __be32 nfsd4_clone_file_range(struct nfsd_file *nf_src, u64 src_pos,
 {
        struct file *src = nf_src->nf_file;
        struct file *dst = nf_dst->nf_file;
+       errseq_t since;
        loff_t cloned;
        __be32 ret = 0;
 
-       down_write(&nf_dst->nf_rwsem);
+       since = READ_ONCE(dst->f_wb_err);
        cloned = vfs_clone_file_range(src, src_pos, dst, dst_pos, count, 0);
        if (cloned < 0) {
                ret = nfserrno(cloned);
@@ -538,6 +543,8 @@ __be32 nfsd4_clone_file_range(struct nfsd_file *nf_src, u64 src_pos,
                loff_t dst_end = count ? dst_pos + count - 1 : LLONG_MAX;
                int status = vfs_fsync_range(dst, dst_pos, dst_end, 0);
 
+               if (!status)
+                       status = filemap_check_wb_err(dst->f_mapping, since);
                if (!status)
                        status = commit_inode_metadata(file_inode(src));
                if (status < 0) {
@@ -547,7 +554,6 @@ __be32 nfsd4_clone_file_range(struct nfsd_file *nf_src, u64 src_pos,
                }
        }
 out_err:
-       up_write(&nf_dst->nf_rwsem);
        return ret;
 }
 
@@ -950,6 +956,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
        struct super_block      *sb = file_inode(file)->i_sb;
        struct svc_export       *exp;
        struct iov_iter         iter;
+       errseq_t                since;
        __be32                  nfserr;
        int                     host_err;
        int                     use_wgather;
@@ -987,21 +994,22 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
                flags |= RWF_SYNC;
 
        iov_iter_kvec(&iter, WRITE, vec, vlen, *cnt);
+       since = READ_ONCE(file->f_wb_err);
        if (flags & RWF_SYNC) {
-               down_write(&nf->nf_rwsem);
+               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));
-               up_write(&nf->nf_rwsem);
        } else {
-               down_read(&nf->nf_rwsem);
                if (verf)
                        nfsd_copy_boot_verifier(verf,
                                        net_generic(SVC_NET(rqstp),
                                        nfsd_net_id));
                host_err = vfs_iter_write(file, &iter, &pos, flags);
-               up_read(&nf->nf_rwsem);
        }
        if (host_err < 0) {
                nfsd_reset_boot_verifier(net_generic(SVC_NET(rqstp),
@@ -1011,6 +1019,9 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf,
        *cnt = host_err;
        nfsd_stats_io_write_add(exp, *cnt);
        fsnotify_modify(file);
+       host_err = filemap_check_wb_err(file->f_mapping, since);
+       if (host_err < 0)
+               goto out_nfserr;
 
        if (stable && use_wgather) {
                host_err = wait_for_concurrent_writes(file);
@@ -1091,19 +1102,6 @@ out:
 }
 
 #ifdef CONFIG_NFSD_V3
-static int
-nfsd_filemap_write_and_wait_range(struct nfsd_file *nf, loff_t offset,
-                                 loff_t end)
-{
-       struct address_space *mapping = nf->nf_file->f_mapping;
-       int ret = filemap_fdatawrite_range(mapping, offset, end);
-
-       if (ret)
-               return ret;
-       filemap_fdatawait_range_keep_errors(mapping, offset, end);
-       return 0;
-}
-
 /*
  * Commit all pending writes to stable storage.
  *
@@ -1134,25 +1132,26 @@ nfsd_commit(struct svc_rqst *rqstp, struct svc_fh *fhp,
        if (err)
                goto out;
        if (EX_ISSYNC(fhp->fh_export)) {
-               int err2 = nfsd_filemap_write_and_wait_range(nf, offset, end);
+               errseq_t since = READ_ONCE(nf->nf_file->f_wb_err);
+               int err2;
 
-               down_write(&nf->nf_rwsem);
-               if (!err2)
-                       err2 = vfs_fsync_range(nf->nf_file, offset, end, 0);
+               err2 = vfs_fsync_range(nf->nf_file, offset, end, 0);
                switch (err2) {
                case 0:
                        nfsd_copy_boot_verifier(verf, net_generic(nf->nf_net,
                                                nfsd_net_id));
+                       err2 = filemap_check_wb_err(nf->nf_file->f_mapping,
+                                                   since);
+                       err = nfserrno(err2);
                        break;
                case -EINVAL:
                        err = nfserr_notsupp;
                        break;
                default:
-                       err = nfserrno(err2);
                        nfsd_reset_boot_verifier(net_generic(nf->nf_net,
                                                 nfsd_net_id));
+                       err = nfserrno(err2);
                }
-               up_write(&nf->nf_rwsem);
        } else
                nfsd_copy_boot_verifier(verf, net_generic(nf->nf_net,
                                        nfsd_net_id));