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

NFSD: only call fh_unlock() once in nfsd_link()

Browse source 
[ Upstream commit e18bcb33bc5b69bccc2b532075aa00bb49cc01c5 ]

On non-error paths, nfsd_link() calls fh_unlock() twice.  This is safe
because fh_unlock() records that the unlock has been done and doesn't
repeat it.
However it makes the code a little confusing and interferes with changes
that are planned for directory locking.

So rearrange the code to ensure fh_unlock() is called exactly once if
fh_lock() was called.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: NeilBrown <neilb@suse.de>
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 1c0a2ac5b9
commit c5547a3fc7
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
fs/nfsd/vfs.c
View file

@ -1556,9 +1556,10 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,
dirp = d_inode(ddir); dirp = d_inode(ddir);
dnew = lookup_one_len(name, ddir, len); dnew = lookup_one_len(name, ddir, len);
host_err = PTR_ERR(dnew); if (IS_ERR(dnew)) {
if (IS_ERR(dnew)) err = nfserrno(PTR_ERR(dnew));
goto out_nfserr; goto out_unlock;
}
dold = tfhp->fh_dentry; dold = tfhp->fh_dentry;
@ -1577,17 +1578,17 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp,
else else
err = nfserrno(host_err); err = nfserrno(host_err);
} }
out_dput:
dput(dnew); dput(dnew);
out_unlock: out_drop_write:
fh_unlock(ffhp);
fh_drop_write(tfhp); fh_drop_write(tfhp);
out: out:
return err; return err;
out_nfserr: out_dput:
err = nfserrno(host_err); dput(dnew);
goto out_unlock; out_unlock:
fh_unlock(ffhp);
goto out_drop_write;
} }
static void static void