aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2006-01-18 20:43:30 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 22:20:26 -0500
commita525825df15221a95d4c1f5a291d9fde77ef10bc (patch)
tree00e204fc158629b999b27f20f99412cbf5ed0c57 /fs/nfsd
parentc2642ab05b855d2d3b850ddf90dbb02b1b9358ac (diff)
[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: 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')
-rw-r--r--fs/nfsd/nfs4proc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 2a1766ce216f..69ee182575ab 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -210,6 +210,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open
210 goto out; 210 goto out;
211 break; 211 break;
212 case NFS4_OPEN_CLAIM_PREVIOUS: 212 case NFS4_OPEN_CLAIM_PREVIOUS:
213 open->op_stateowner->so_confirmed = 1;
213 /* 214 /*
214 * The CURRENT_FH is already set to the file being 215 * The CURRENT_FH is already set to the file being
215 * opened. (1) set open->op_cinfo, (2) set 216 * 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
221 goto out; 222 goto out;
222 break; 223 break;
223 case NFS4_OPEN_CLAIM_DELEGATE_PREV: 224 case NFS4_OPEN_CLAIM_DELEGATE_PREV:
225 open->op_stateowner->so_confirmed = 1;
224 printk("NFSD: unsupported OPEN claim type %d\n", 226 printk("NFSD: unsupported OPEN claim type %d\n",
225 open->op_claim_type); 227 open->op_claim_type);
226 status = nfserr_notsupp; 228 status = nfserr_notsupp;