]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
NFSv4: Fix a typo in nfs41_sequence_process
authorTrond Myklebust <trond.myklebust@hammerspace.com>
Sat, 9 Jun 2018 16:50:50 +0000 (12:50 -0400)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 14 Jan 2019 09:28:55 +0000 (09:28 +0000)
BugLink: http://bugs.launchpad.net/bugs/1807469
commit 995891006ccbb73c0c9c3923cf9d25c4d07ec16b upstream.

We want to compare the slot_id to the highest slot number advertised by the
server.

Fixes: 3be0f80b5fe9c ("NFSv4.1: Fix up replays of interrupted requests")
Cc: stable@vger.kernel.org # 4.15+
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
fs/nfs/nfs4proc.c

index 083802f7a1e9fac6e9e779ae2c1b31dd0f4287d3..13c1ada250a1b3748b17df5a490578eadada2be5 100644 (file)
@@ -750,7 +750,7 @@ static int nfs41_sequence_process(struct rpc_task *task,
                 * The slot id we used was probably retired. Try again
                 * using a different slot id.
                 */
-               if (slot->seq_nr < slot->table->target_highest_slotid)
+               if (slot->slot_nr < slot->table->target_highest_slotid)
                        goto session_recover;
                goto retry_nowait;
        case -NFS4ERR_SEQ_MISORDERED: