diff options
author | J. Bruce Fields <bfields@fieldses.org> | 2006-02-07 15:58:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 19:12:31 -0500 |
commit | cbd0d51a3318583fabf03bccc7a987e158482361 (patch) | |
tree | 62a7d1d2bb6cd9f11536c2b9873a46b81fcac2a8 /fs/nfsd/nfs4proc.c | |
parent | 0df420d8b6c718d9a5e37531c3a9a6804493e9f4 (diff) |
[PATCH] knfsd: fix nfs4_open lock leak
I just noticed that my patch "don't create on open that fails due to
ERR_GRACE" (recently commited as fb553c0f17444e090db951b96df4d2d71b4f4b6b)
had an obvious problem that causes a deadlock on reboot recovery. Sending
in this now since it seems like a clear 2.6.16 candidate.--b.
We're returning with a lock held in some error cases.
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/nfs4proc.c')
-rw-r--r-- | fs/nfsd/nfs4proc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index a00fe8686293..6d63f1d9e5f5 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c | |||
@@ -195,10 +195,12 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open | |||
195 | 195 | ||
196 | /* Openowner is now set, so sequence id will get bumped. Now we need | 196 | /* Openowner is now set, so sequence id will get bumped. Now we need |
197 | * these checks before we do any creates: */ | 197 | * these checks before we do any creates: */ |
198 | status = nfserr_grace; | ||
198 | if (nfs4_in_grace() && open->op_claim_type != NFS4_OPEN_CLAIM_PREVIOUS) | 199 | if (nfs4_in_grace() && open->op_claim_type != NFS4_OPEN_CLAIM_PREVIOUS) |
199 | return nfserr_grace; | 200 | goto out; |
201 | status = nfserr_no_grace; | ||
200 | if (!nfs4_in_grace() && open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS) | 202 | if (!nfs4_in_grace() && open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS) |
201 | return nfserr_no_grace; | 203 | goto out; |
202 | 204 | ||
203 | switch (open->op_claim_type) { | 205 | switch (open->op_claim_type) { |
204 | case NFS4_OPEN_CLAIM_DELEGATE_CUR: | 206 | case NFS4_OPEN_CLAIM_DELEGATE_CUR: |