NFS/pNFS: Fix a typo in ff_layout_resend_pnfs_read()
authorTrond Myklebust <trond.myklebust@hammerspace.com>
Wed, 16 Dec 2020 22:17:45 +0000 (17:17 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 10:53:57 +0000 (11:53 +0100)
[ Upstream commit 52104f274e2d7f134d34bab11cada8913d4544e2 ]

Don't bump the index twice.

Fixes: 563c53e73b8b ("NFS: Fix flexfiles read failover")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/nfs/flexfilelayout/flexfilelayout.c

index 24bf579..fd0eda3 100644 (file)
@@ -1056,7 +1056,7 @@ static void ff_layout_resend_pnfs_read(struct nfs_pgio_header *hdr)
        u32 idx = hdr->pgio_mirror_idx + 1;
        u32 new_idx = 0;
 
-       if (ff_layout_choose_any_ds_for_read(hdr->lseg, idx + 1, &new_idx))
+       if (ff_layout_choose_any_ds_for_read(hdr->lseg, idx, &new_idx))
                ff_layout_send_layouterror(hdr->lseg);
        else
                pnfs_error_mark_layout_for_return(hdr->inode, hdr->lseg);