Commit cbd0d51a authored Feb 07, 2006 by J. Bruce Fields Committed by Linus Torvalds Feb 07, 2006

[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 fb553c0f)
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>

parent 0df420d8

fs/nfsd/nfs4proc.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -195,10 +195,12 @@ nfsd4_open(struct svc_rqst rqstp, struct svc_fh current_fh, struct nfsd4_open

		/* Openowner is now set, so sequence id will get bumped. Now we need
		* these checks before we do any creates: */
		status = nfserr_grace;
		if (nfs4_in_grace() && open->op_claim_type != NFS4_OPEN_CLAIM_PREVIOUS)
		return nfserr_grace;
		goto out;
		status = nfserr_no_grace;
		if (!nfs4_in_grace() && open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS)
		return nfserr_no_grace;
		goto out;

		switch (open->op_claim_type) {
		case NFS4_OPEN_CLAIM_DELEGATE_CUR: