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

Commit b648330a authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] nfsd4: ERR_GRACE should bump seqid on open 



The GRACE and NOGRACE errors should bump the sequence id on open.  So we delay
the handling of these errors until nfsd4_process_open2, at which point we've
set the open owner, so the encode routine will be able to bump the sequence
id.

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0fa822e4

fs/nfsd/nfs4proc.c

+0 −6
Original line number Diff line number Diff line
@@ -169,12 +169,6 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open 
		(int)open->op_fname.len, open->op_fname.data,

		open->op_stateowner);



	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;



	/* This check required by spec. */

	if (open->op_create && open->op_claim_type != NFS4_OPEN_CLAIM_NULL)

		return nfserr_inval;

fs/nfsd/nfs4state.c

+6 −0
Original line number Diff line number Diff line
@@ -1790,6 +1790,12 @@ 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;