Commit 660d1eb2 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS/flexfile: Don't merge layout segments if the mirrors don't match 



Check that the number of mirrors, and the mirror information matches
before deciding to merge layout segments in pNFS/flexfiles.

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

fs/nfs/flexfilelayout/flexfilelayout.c

+19 −0
Original line number Diff line number Diff line
@@ -283,6 +283,23 @@ static void _ff_layout_free_lseg(struct nfs4_ff_layout_segment *fls) 
	}

}



static bool

ff_lseg_match_mirrors(struct pnfs_layout_segment *l1,

		struct pnfs_layout_segment *l2)

{

	const struct nfs4_ff_layout_segment *fl1 = FF_LAYOUT_LSEG(l1);

	const struct nfs4_ff_layout_segment *fl2 = FF_LAYOUT_LSEG(l1);

	u32 i;



	if (fl1->mirror_array_cnt != fl2->mirror_array_cnt)

		return false;

	for (i = 0; i < fl1->mirror_array_cnt; i++) {

		if (fl1->mirror_array[i] != fl2->mirror_array[i])

			return false;

	}

	return true;

}



static bool

ff_lseg_range_is_after(const struct pnfs_layout_range *l1,

		const struct pnfs_layout_range *l2)
@@ -318,6 +335,8 @@ ff_lseg_merge(struct pnfs_layout_segment *new, 
			new->pls_range.length);

	if (new_end < old->pls_range.offset)

		return false;

	if (!ff_lseg_match_mirrors(new, old))

		return false;



	/* Mergeable: copy info from 'old' to 'new' */

	if (new_end < old_end)

CRA Git | Maintained and supported by SUSTech CRA and CCSE