Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NFSD: use (un)lock_inode instead of fh_(un)lock for file operations

Browse source 
[ Upstream commit bb4d53d66e4b8c8b8e5634802262e53851a2d2db ]

When locking a file to access ACLs and xattrs etc, use explicit locking
with inode_lock() instead of fh_lock().  This means that the calls to
fh_fill_pre/post_attr() are also explicit which improves readability and
allows us to place them only where they are needed.  Only the xattr
calls need pre/post information.

When locking a file we don't need I_MUTEX_PARENT as the file is not a
parent of anything, so we can use inode_lock() directly rather than the
inode_lock_nested() call that fh_lock() uses.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: NeilBrown <neilb@suse.de>
[ cel: backported to 5.10.y, prior to idmapped mounts ]
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
NeilBrown 2022-07-26 16:45:30 +10:00 • committed by Ksawlii
parent 574c240441
commit a81e7962f6
4 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/nfsd/nfs2acl.c
View file

@ -111,7 +111,7 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst *rqstp)
if (error)
goto out_errno;
fh_lock(fh);
inode_lock(inode);
error = set_posix_acl(inode, ACL_TYPE_ACCESS, argp->acl_access);
if (error)
@ -120,7 +120,7 @@ static __be32 nfsacld_proc_setacl(struct svc_rqst *rqstp)
if (error)
goto out_drop_lock;
fh_unlock(fh);
inode_unlock(inode);
fh_drop_write(fh);
@ -134,7 +134,7 @@ out:
return rpc_success;
out_drop_lock:
fh_unlock(fh);
inode_unlock(inode);
fh_drop_write(fh);
out_errno:
resp->status = nfserrno(error);

4
fs/nfsd/nfs3acl.c
View file

@ -101,7 +101,7 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp)
if (error)
goto out_errno;
fh_lock(fh);
inode_lock(inode);
error = set_posix_acl(inode, ACL_TYPE_ACCESS, argp->acl_access);
if (error)
@ -109,7 +109,7 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp)
error = set_posix_acl(inode, ACL_TYPE_DEFAULT, argp->acl_default);
out_drop_lock:
fh_unlock(fh);
inode_unlock(inode);
fh_drop_write(fh);
out_errno:
resp->status = nfserrno(error);

9
fs/nfsd/nfs4state.c
View file

@ -7432,21 +7432,22 @@ out:
static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock)
{
struct nfsd_file *nf;
struct inode *inode;
__be32 err;
err = nfsd_file_acquire(rqstp, fhp, NFSD_MAY_READ, &nf);
if (err)
return err;
fh_lock(fhp); /* to block new leases till after test_lock: */
err = nfserrno(nfsd_open_break_lease(fhp->fh_dentry->d_inode,
NFSD_MAY_READ));
inode = fhp->fh_dentry->d_inode;
inode_lock(inode); /* to block new leases till after test_lock: */
err = nfserrno(nfsd_open_break_lease(inode, NFSD_MAY_READ));
if (err)
goto out;
lock->fl_file = nf->nf_file;
err = nfserrno(vfs_test_lock(nf->nf_file, lock));
lock->fl_file = NULL;
out:
fh_unlock(fhp);
inode_unlock(inode);
nfsd_file_put(nf);
return err;
}

44
fs/nfsd/vfs.c
View file

@ -434,7 +434,7 @@ nfsd_setattr(struct svc_rqst *rqstp, struct svc_fh *fhp,
return err;
}
fh_lock(fhp);
inode_lock(inode);
if (size_change) {
/*
* RFC5661, Section 18.30.4:
@ -480,7 +480,7 @@ out_unlock:
!attr->na_aclerr && attr->na_dpacl && S_ISDIR(inode->i_mode))
attr->na_aclerr = set_posix_acl(inode, ACL_TYPE_DEFAULT,
attr->na_dpacl);
fh_unlock(fhp);
inode_unlock(inode);
if (size_change)
put_write_access(inode);
out:
@ -1570,18 +1570,10 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,
err = nfserr_noent;
if (d_really_is_negative(dold))
goto out_dput;
<<<<<<< current
host_err = vfs_link(dold, dirp, dnew, NULL);
fh_unlock(ffhp);
||||||| constructed merge base
host_err = vfs_link(dold, &init_user_ns, dirp, dnew, NULL);
fh_unlock(ffhp);
=======
fh_fill_pre_attrs(ffhp);
host_err = vfs_link(dold, &init_user_ns, dirp, dnew, NULL);
host_err = vfs_link(dold, dirp, dnew, NULL);
fh_fill_post_attrs(ffhp);
inode_unlock(dirp);
>>>>>>> patched
if (!host_err) {
err = nfserrno(commit_metadata(ffhp));
if (!err)
@ -2182,13 +2174,16 @@ out:
return err;
}
/*
* Removexattr and setxattr need to call fh_lock to both lock the inode
* and set the change attribute. Since the top-level vfs_removexattr
* and vfs_setxattr calls already do their own inode_lock calls, call
* the _locked variant. Pass in a NULL pointer for delegated_inode,
* and let the client deal with NFS4ERR_DELAY (same as with e.g.
* setattr and remove).
/**
* nfsd_removexattr - Remove an extended attribute
* @rqstp: RPC transaction being executed
* @fhp: NFS filehandle of object with xattr to remove
* @name: name of xattr to remove (NUL-terminate)
*
* Pass in a NULL pointer for delegated_inode, and let the client deal
* with NFS4ERR_DELAY (same as with e.g. setattr and remove).
*
* Returns nfs_ok on success, or an nfsstat in network byte order.
*/
__be32
nfsd_removexattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name)
@ -2204,11 +2199,13 @@ nfsd_removexattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name)
if (ret)
return nfserrno(ret);
fh_lock(fhp);
inode_lock(fhp->fh_dentry->d_inode);
fh_fill_pre_attrs(fhp);
ret = __vfs_removexattr_locked(fhp->fh_dentry, name, NULL);
fh_unlock(fhp);
fh_fill_post_attrs(fhp);
inode_unlock(fhp->fh_dentry->d_inode);
fh_drop_write(fhp);
return nfsd_xattr_errno(ret);
@ -2228,12 +2225,13 @@ nfsd_setxattr(struct svc_rqst *rqstp, struct svc_fh *fhp, char *name,
ret = fh_want_write(fhp);
if (ret)
return nfserrno(ret);
fh_lock(fhp);
inode_lock(fhp->fh_dentry->d_inode);
fh_fill_pre_attrs(fhp);
ret = __vfs_setxattr_locked(fhp->fh_dentry, name, buf, len, flags,
NULL);
fh_unlock(fhp);
fh_fill_post_attrs(fhp);
inode_unlock(fhp->fh_dentry->d_inode);
fh_drop_write(fhp);
return nfsd_xattr_errno(ret);