mirror of
https://github.com/torvalds/linux
synced 2024-10-15 07:47:34 +00:00
nfsd: Fix error cleanup path in nfsd_rename()
Commita8b0026847
("rename(): avoid a deadlock in the case of parents having no common ancestor") added an error bail out path. However this path does not drop the remount protection that has been acquired. Fix the cleanup path to properly drop the remount protection. Fixes:a8b0026847
("rename(): avoid a deadlock in the case of parents having no common ancestor") Signed-off-by: Jan Kara <jack@suse.cz> Reviewed-by: Jeff Layton <jlayton@kernel.org> Acked-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
parent
9b350d3e34
commit
9fe6e9e7b5
|
@ -1853,7 +1853,7 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen,
|
|||
trap = lock_rename(tdentry, fdentry);
|
||||
if (IS_ERR(trap)) {
|
||||
err = (rqstp->rq_vers == 2) ? nfserr_acces : nfserr_xdev;
|
||||
goto out;
|
||||
goto out_want_write;
|
||||
}
|
||||
err = fh_fill_pre_attrs(ffhp);
|
||||
if (err != nfs_ok)
|
||||
|
@ -1923,6 +1923,7 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen,
|
|||
}
|
||||
out_unlock:
|
||||
unlock_rename(tdentry, fdentry);
|
||||
out_want_write:
|
||||
fh_drop_write(ffhp);
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue