NFSv4.1: Handle NFS4ERR_DELAY replies to OP_SEQUENCE correctly

commit 1a0de36d18c37328b8d19b0160ea904db1c8cb67 upstream.

Don't assume that the NFS4ERR_DELAY means that the server is processing
this slot id.

Fixes: 5d49345bf7a6 ("NFSv4.1: Avoid false retries when RPC calls are interrupted")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 5dec4dc86140f31f7842bc4b140dc1d05e9fc738..0e09bfd52031efdfcb045ee23fd9fccdacadb861 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -848,7 +848,6 @@ static int nfs41_sequence_process(struct rpc_task *task,
                        __func__,
                        slot->slot_nr,
                        slot->seq_nr);
-               nfs4_slot_sequence_acked(slot, slot->seq_nr);
                goto out_retry;
        case -NFS4ERR_RETRY_UNCACHED_REP:
        case -NFS4ERR_SEQ_FALSE_RETRY: