NFSv4.1: Fix the client behaviour on NFS4ERR_SEQ_FALSE_RETRY

[ Upstream commit f9312a541050007ec59eb0106273a0a10718cd83 ]

If the server returns NFS4ERR_SEQ_FALSE_RETRY or NFS4ERR_RETRY_UNCACHED_REP,
then it thinks we're trying to replay an existing request. If so, then
let's just bump the sequence ID and retry the operation.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 409acdda70dd2c56389b73acffe2603a9ffc11fa..6d2b44d4384074f0a1ed7827749e96a79af70c66 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -746,6 +746,13 @@ static int nfs41_sequence_process(struct rpc_task *task,
                        slot->slot_nr,
                        slot->seq_nr);
                goto out_retry;
+       case -NFS4ERR_RETRY_UNCACHED_REP:
+       case -NFS4ERR_SEQ_FALSE_RETRY:
+               /*
+                * The server thinks we tried to replay a request.
+                * Retry the call after bumping the sequence ID.
+                */
+               goto retry_new_seq;
        case -NFS4ERR_BADSLOT:
                /*
                 * The slot id we used was probably retired. Try again
@@ -770,10 +777,6 @@ static int nfs41_sequence_process(struct rpc_task *task,
                        goto retry_nowait;
                }
                goto session_recover;
-       case -NFS4ERR_SEQ_FALSE_RETRY:
-               if (interrupted)
-                       goto retry_new_seq;
-               goto session_recover;
        default:
                /* Just update the slot sequence no. */
                slot->seq_done = 1;