Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 094069f1 authored by Jeff Layton's avatar Jeff Layton Committed by Anna Schumaker
Browse files

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: default avatarJeff Layton <jeff.layton@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 6d597e17

fs/nfs/flexfilelayout/flexfilelayout.c

+0 −2
Original line number Diff line number Diff line
@@ -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:

fs/nfs/flexfilelayout/flexfilelayoutdev.c

+1 −7
Original line number Diff line number Diff line
@@ -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;

	}