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

Commit 9980c638 authored by Milan Broz's avatar Milan Broz Committed by Alasdair G Kergon
Browse files

dm table: remove merge_bvec sector restriction 



Remove max_sector restriction - merge function replaced it.

Signed-off-by: default avatarMilan Broz <mbroz@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 7bc3447b

drivers/md/dm-table.c

+6 −7
Original line number Diff line number Diff line
@@ -506,14 +506,13 @@ void dm_set_device_limits(struct dm_target *ti, struct block_device *bdev) 
	rs->max_sectors =

		min_not_zero(rs->max_sectors, q->max_sectors);



	/* FIXME: Device-Mapper on top of RAID-0 breaks because DM

	 *        currently doesn't honor MD's merge_bvec_fn routine.

	 *        In this case, we'll force DM to use PAGE_SIZE or

	 *        smaller I/O, just to be safe. A better fix is in the

	 *        works, but add this for the time being so it will at

	 *        least operate correctly.

	 */

	if (q->merge_bvec_fn)

	/*

	 * Check if merge fn is supported.

	 * If not we'll force DM to use PAGE_SIZE or

	 * smaller I/O, just to be safe.

	 */



	if (q->merge_bvec_fn && !ti->type->merge)

		rs->max_sectors =

			min_not_zero(rs->max_sectors,

				     (unsigned int) (PAGE_SIZE >> 9));