From: Trond Myklebust Date: Wed, 16 Dec 2020 22:17:45 +0000 (-0500) Subject: NFS/pNFS: Fix a typo in ff_layout_resend_pnfs_read() X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~491^2~249 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=de16a86c9d70e3f0f39b3ccfe7cd0d12126c8cc9;p=linux.git NFS/pNFS: Fix a typo in ff_layout_resend_pnfs_read() [ Upstream commit 52104f274e2d7f134d34bab11cada8913d4544e2 ] Don't bump the index twice. Fixes: 563c53e73b8b ("NFS: Fix flexfiles read failover") Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index 24bf5797f88a..fd0eda328943 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -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);