Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb553c0f authored Jan 18, 2006 by J. Bruce Fields Committed by Linus Torvalds Jan 18, 2006

[PATCH] nfsd4: don't create on open that fails due to ERR_GRACE



In an earlier patch (commit b648330a) I noted
that a too-early grace-period check was preventing us from bumping the
sequence id on open.  Unfortunately in that patch I stupidly moved the
grace-period check back too far, so now an open for create can succesfully
create the file while still returning ERR_GRACE.

The correct place for that check is after we've set the open_owner and handled
any replays, but before we actually start mucking with the filesystem.

Thanks to Avishay Traeger for reporting the bug.

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 0f442aa2

fs/nfsd/nfs4proc.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -192,6 +192,14 @@ nfsd4_open(struct svc_rqst rqstp, struct svc_fh current_fh, struct nfsd4_open
		}
		if (status)
		goto out;

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

		switch (open->op_claim_type) {
		case NFS4_OPEN_CLAIM_DELEGATE_CUR:
		status = nfserr_inval;

fs/nfsd/nfs4state.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -1732,12 +1732,6 @@ nfsd4_process_open2(struct svc_rqst rqstp, struct svc_fh current_fh, struct nf
		struct nfs4_delegation *dp = NULL;
		int status;

		if (nfs4_in_grace() && open->op_claim_type != NFS4_OPEN_CLAIM_PREVIOUS)
		return nfserr_grace;

		if (!nfs4_in_grace() && open->op_claim_type == NFS4_OPEN_CLAIM_PREVIOUS)
		return nfserr_no_grace;

		status = nfserr_inval;
		if (!TEST_ACCESS(open->op_share_access) \|\| !TEST_DENY(open->op_share_deny))
		goto out;