DuDu371/linux-rockchip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfsd: Fix a regression in nfsd_setattr()

Browse source 
[ Upstream commit 6412e44c40aaf8f1d7320b2099c5bdd6cb9126ac ]

Commit bb4d53d66e ("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: bb4d53d66e ("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 v6.1.y ]
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Trond Myklebust 2024-08-26 11:07:03 -04:00 • committed by Greg Kroah-Hartman
parent 3977ac0c22
commit 37a87b0518
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fs/nfsd/nfs4proc.c
View file

@ -1106,6 +1106,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
}; };
struct inode *inode; struct inode *inode;
__be32 status = nfs_ok; __be32 status = nfs_ok;
bool save_no_wcc;
int err; int err;
if (setattr->sa_iattr.ia_valid & ATTR_SIZE) { 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) if (status)
goto out; 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, status = nfsd_setattr(rqstp, &cstate->current_fh, &attrs,
0, (time64_t)0); 0, (time64_t)0);
cstate->current_fh.fh_no_wcc = save_no_wcc;
if (!status) if (!status)
status = nfserrno(attrs.na_labelerr); status = nfserrno(attrs.na_labelerr);
if (!status) if (!status)

6
fs/nfsd/vfs.c
View file

@ -475,7 +475,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,
int accmode = NFSD_MAY_SATTR; int accmode = NFSD_MAY_SATTR;
umode_t ftype = 0; umode_t ftype = 0;
__be32 err; __be32 err;
int host_err; int host_err = 0;
bool get_write_count; bool get_write_count;
bool size_change = (iap->ia_valid & ATTR_SIZE); bool size_change = (iap->ia_valid & ATTR_SIZE);
int retries; int retries;
@ -533,6 +533,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,
} }
inode_lock(inode); inode_lock(inode);
fh_fill_pre_attrs(fhp);
for (retries = 1;;) { for (retries = 1;;) {
struct iattr attrs; struct iattr attrs;
@ -560,13 +561,14 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,
attr->na_aclerr = set_posix_acl(&init_user_ns, attr->na_aclerr = set_posix_acl(&init_user_ns,
inode, ACL_TYPE_DEFAULT, inode, ACL_TYPE_DEFAULT,
attr->na_dpacl); attr->na_dpacl);
fh_fill_post_attrs(fhp);
inode_unlock(inode); inode_unlock(inode);
if (size_change) if (size_change)
put_write_access(inode); put_write_access(inode);
out: out:
if (!host_err) if (!host_err)
host_err = commit_metadata(fhp); host_err = commit_metadata(fhp);
return nfserrno(host_err); return err != 0 ? err : nfserrno(host_err);
} }
#if defined(CONFIG_NFSD_V4) #if defined(CONFIG_NFSD_V4)