Commit 9bfffea3 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS/flexfiles: Avoid spurious layout returns in ff_layout_choose_ds_for_read 



The callers of ff_layout_choose_ds_for_read() should decide whether or
not they want to return the layout on error. Sometimes, we may just want
to retry from the beginning.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent cac1d3a2

fs/nfs/flexfilelayout/flexfilelayout.c

+1 −5
Original line number Diff line number Diff line
@@ -740,16 +740,12 @@ ff_layout_choose_ds_for_read(struct pnfs_layout_segment *lseg, 
	struct nfs4_ff_layout_segment *fls = FF_LAYOUT_LSEG(lseg);

	struct nfs4_ff_layout_mirror *mirror;

	struct nfs4_pnfs_ds *ds;

	bool fail_return = false;

	u32 idx;



	/* mirrors are initially sorted by efficiency */

	for (idx = start_idx; idx < fls->mirror_array_cnt; idx++) {

		if (idx+1 == fls->mirror_array_cnt)

			fail_return = !check_device;



		mirror = FF_LAYOUT_COMP(lseg, idx);

		ds = nfs4_ff_layout_prepare_ds(lseg, mirror, fail_return);

		ds = nfs4_ff_layout_prepare_ds(lseg, mirror, false);

		if (!ds)

			continue;

CRA Git | Maintained and supported by SUSTech CRA and CCSE