diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2006-06-30 01:56:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 11:25:40 -0700 |
| commit | a8cddc5dfc1d03a91885ef27eb91418e665577ce (patch) | |
| tree | a9fc586e6b6262686c406c7393f0417aa805e5f8 /fs | |
| parent | 7e4053645a67097fa9bec2794d685b1d3928757a (diff) | |
| download | lwn-a8cddc5dfc1d03a91885ef27eb91418e665577ce.tar.gz lwn-a8cddc5dfc1d03a91885ef27eb91418e665577ce.zip | |
[PATCH] knfsd: nfsd4: fix open_confirm locking
Fix an improper unlock in an error path.
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')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 7c7d01672d35..21497321a525 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2252,8 +2252,9 @@ nfsd4_open_confirm(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfs (int)current_fh->fh_dentry->d_name.len, current_fh->fh_dentry->d_name.name); - if ((status = fh_verify(rqstp, current_fh, S_IFREG, 0))) - goto out; + status = fh_verify(rqstp, current_fh, S_IFREG, 0); + if (status) + return status; nfs4_lock_state(); |