nfsd: Fix a regression in nfsd_setattr()

[ Upstream commit 6412e44c40aaf8f1d7320b2099c5bdd6cb9126ac ]

Commit bb4d53d66e4b ("NFSD: use (un)lock_inode instead of
fh_(un)lock for file operations") broke the NFSv3 pre/post op
attributes behaviour when doing a SETATTR rpc call by stripping out
the calls to fh_fill_pre_attrs() and fh_fill_post_attrs().

Fixes: bb4d53d66e4b ("NFSD: use (un)lock_inode instead of fh_(un)lock for file operations")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: NeilBrown <neilb@suse.de>
Message-ID: <20240216012451.22725-1-trondmy@kernel.org>
[ cel: adjusted to apply to v5.15.y ]
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index ba53cd89ec62c30881f23c72984709960ab7234a..c14f5ac1484c9a2d94fd16b75aebc9e5cf39dbdc 100644 (file)
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1106,6 +1106,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
        };
        struct inode *inode;
        __be32 status = nfs_ok;
+       bool save_no_wcc;
        int err;
 
        if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
@@ -1131,8 +1132,11 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
 
        if (status)
                goto out;
+       save_no_wcc = cstate->current_fh.fh_no_wcc;
+       cstate->current_fh.fh_no_wcc = true;
        status = nfsd_setattr(rqstp, &cstate->current_fh, &attrs,
                                0, (time64_t)0);
+       cstate->current_fh.fh_no_wcc = save_no_wcc;
        if (!status)
                status = nfserrno(attrs.na_labelerr);
        if (!status)

diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 76ce19d42336fb4c70e5088fab6280a896ff329d..0f430548bfbbe359265051a3777ac9dcfcc2d2a0 100644 (file)
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -474,7 +474,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,
        int             accmode = NFSD_MAY_SATTR;
        umode_t         ftype = 0;
        __be32          err;
-       int             host_err;
+       int             host_err = 0;
        bool            get_write_count;
        bool            size_change = (iap->ia_valid & ATTR_SIZE);
        int             retries;
@@ -532,6 +532,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,
        }
 
        inode_lock(inode);
+       fh_fill_pre_attrs(fhp);
        for (retries = 1;;) {
                struct iattr attrs;
 
@@ -559,13 +560,14 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,
                attr->na_aclerr = set_posix_acl(&init_user_ns,
                                                inode, ACL_TYPE_DEFAULT,
                                                attr->na_dpacl);
+       fh_fill_post_attrs(fhp);
        inode_unlock(inode);
        if (size_change)
                put_write_access(inode);
 out:
        if (!host_err)
                host_err = commit_metadata(fhp);
-       return nfserrno(host_err);
+       return err != 0 ? err : nfserrno(host_err);
 }
 
 #if defined(CONFIG_NFSD_V4)