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

Commit a525825d authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

[PATCH] nfsd4: handle replays of failed open reclaims 



We need to make sure open reclaims are marked confirmed immediately so that we
can handle replays even if they fail (e.g.  with a seqid-incrementing error).
(See 8.1.8.)

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c2642ab0

fs/nfsd/nfs4proc.c

+2 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open 
				goto out;

			break;

		case NFS4_OPEN_CLAIM_PREVIOUS:

			open->op_stateowner->so_confirmed = 1;

			/*

			 * The CURRENT_FH is already set to the file being

			 * opened.  (1) set open->op_cinfo, (2) set
@@ -221,6 +222,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open 
				goto out;

			break;

             	case NFS4_OPEN_CLAIM_DELEGATE_PREV:

			open->op_stateowner->so_confirmed = 1;

			printk("NFSD: unsupported OPEN claim type %d\n",

				open->op_claim_type);

			status = nfserr_notsupp;