flexfiles: remove pointless setting of NFS_LAYOUT_RETURN_REQUESTED

Setting just the NFS_LAYOUT_RETURN_REQUESTED flag doesn't do anything,
unless there are lsegs that are also being marked for return. At the
point where that happens this flag is also set, so these set_bit calls
don't do anything useful.

Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

2 files changed, 1 insertions, 9 deletions

diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index 3bac2094c175..40bccb2c06d1 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -1270,8 +1270,6 @@ static int ff_layout_read_done_cb(struct rpc_task *task,
                                         hdr->pgio_mirror_idx + 1,
                                         &hdr->pgio_mirror_idx))
                         goto out_eagain;
-                set_bit(NFS_LAYOUT_RETURN_REQUESTED,
-                        &hdr->lseg->pls_layout->plh_flags);
                 pnfs_read_resend_pnfs(hdr);
                 return task->tk_status;
         case -NFS4ERR_RESET_TO_MDS:
diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c
index 8242ab327fee..bb598923b2ef 100644
--- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c
+++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c
@@ -394,13 +394,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx,
                                          mirror, lseg->pls_range.offset,
                                          lseg->pls_range.length, NFS4ERR_NXIO,
                                          OP_ILLEGAL, GFP_NOIO);
-                if (!fail_return) {
-                        if (ff_layout_has_available_ds(lseg))
-                                set_bit(NFS_LAYOUT_RETURN_REQUESTED,
-                                        &lseg->pls_layout->plh_flags);
-                        else
-                                pnfs_error_mark_layout_for_return(ino, lseg);
-                } else
+                if (fail_return || !ff_layout_has_available_ds(lseg))
                         pnfs_error_mark_layout_for_return(ino, lseg);
                 ds = NULL;
         }