summaryrefslogtreecommitdiff
path: root/fs/nfsd/nfs4state.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-08-25 18:17:52 -0400
committerJ. Bruce Fields <bfields@redhat.com>2011-09-01 07:29:01 -0400
commitfff6ca9cc46857e5814cf687e5fb1b8a876766a4 (patch)
treeb96032c84f885c5be6a2efd8326873f80150419c /fs/nfsd/nfs4state.c
parent5ec094c1096ab3bb795651855d53f18daa26afde (diff)
nfsd4: eliminate impossible open replay case
If open fails with any error other than nfserr_replay_me, then the main nfsd4_proc_compound() loop continues unconditionally to nfsd4_encode_operation(), which will always call encode_seqid_op_tail. Thus the condition we check for here does not occur. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4state.c')
-rw-r--r--fs/nfsd/nfs4state.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 6cf729a096c3..26b0c75aa93b 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2495,18 +2495,8 @@ nfsd4_process_open1(struct nfsd4_compound_state *cstate,
open->op_stateowner = NULL;
goto renew;
}
- if (open->op_seqid == sop->so_seqid - 1) {
- if (sop->so_replay.rp_buflen)
- return nfserr_replay_me;
- /* The original OPEN failed so spectacularly
- * that we don't even have replay data saved!
- * Therefore, we have no choice but to continue
- * processing this OPEN; presumably, we'll
- * fail again for the same reason.
- */
- dprintk("nfsd4_process_open1: replay with no replay cache\n");
- goto renew;
- }
+ if (open->op_seqid == sop->so_seqid - 1)
+ return nfserr_replay_me;
if (open->op_seqid != sop->so_seqid)
return nfserr_bad_seqid;
renew: