diff options
| author | David M. Richter <richterd@citi.umich.edu> | 2006-06-30 12:56:15 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 22:25:40 +0400 |
| commit | 270d56e536dcd37cc819a6adb51d918185411048 (patch) | |
| tree | 7594eb9368e1977ff68bc8a9c61afa2cc41640c5 /fs/nfsd | |
| parent | 6e46d8a9ccbcd3273bdb6902ca2b6da62c253e73 (diff) | |
| download | linux-270d56e536dcd37cc819a6adb51d918185411048.tar.xz | |
[PATCH] knfsd: nfsd: fix misplaced fh_unlock() in nfsd_link()
In the event that lookup_one_len() fails in nfsd_link(), fh_unlock() is
skipped and locks are held overlong.
Patch was tested on 2.6.17-rc2 by causing lookup_one_len() to fail and
verifying that fh_unlock() gets called appropriately.
Signed-off-by: David M. Richter <richterd@citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/vfs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index b653ede37e66..f916b170e136 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1517,14 +1517,15 @@ nfsd_link(struct svc_rqst *rqstp, struct svc_fh *ffhp, err = nfserrno(err); } - fh_unlock(ffhp); dput(dnew); +out_unlock: + fh_unlock(ffhp); out: return err; out_nfserr: err = nfserrno(err); - goto out; + goto out_unlock; } /* |