diff options
| author | NeilBrown <neilb@suse.de> | 2022-07-26 16:45:30 +1000 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2022-08-04 10:28:41 -0400 |
| commit | bb4d53d66e4b8c8b8e5634802262e53851a2d2db (patch) | |
| tree | 090dfe5ac0d035f91cfe21c8506a599b0c6da309 /fs/nfsd/nfs3acl.c | |
| parent | debf16f0c671cb8db154a9ebcd6014cfff683b80 (diff) | |
| download | linux-stable-bb4d53d66e4b8c8b8e5634802262e53851a2d2db.tar.gz linux-stable-bb4d53d66e4b8c8b8e5634802262e53851a2d2db.tar.bz2 linux-stable-bb4d53d66e4b8c8b8e5634802262e53851a2d2db.zip | |
NFSD: use (un)lock_inode instead of fh_(un)lock for file operations
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>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/nfsd/nfs3acl.c')
| -rw-r--r-- | fs/nfsd/nfs3acl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c index 35b2ebda14da..9446c6743664 100644 --- a/fs/nfsd/nfs3acl.c +++ b/fs/nfsd/nfs3acl.c @@ -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(&init_user_ns, inode, ACL_TYPE_ACCESS, argp->acl_access); @@ -111,7 +111,7 @@ static __be32 nfsd3_proc_setacl(struct svc_rqst *rqstp) argp->acl_default); out_drop_lock: - fh_unlock(fh); + inode_unlock(inode); fh_drop_write(fh); out_errno: resp->status = nfserrno(error); |