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

Commit 3a0f9aae authored by Jonathan Brassow's avatar Jonathan Brassow Committed by Alasdair G Kergon
Browse files

dm raid: round region_size to power of two 



If the user does not supply a bitmap region_size to the dm raid target,
a reasonable size is computed automatically.  If this is not a power of 2,
the md code will report an error later.

This patch catches the problem early and rounds the region_size to the
next power of two.

Signed-off-by: default avatarJonathan Brassow <jbrassow@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 2aab3850

drivers/md/dm-raid.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -295,9 +295,11 @@ static int validate_region_size(struct raid_set *rs, unsigned long region_size) 
		 * Choose a reasonable default.  All figures in sectors.

		 * Choose a reasonable default.  All figures in sectors.

		 */

		 */

		if (min_region_size > (1 << 13)) {

		if (min_region_size > (1 << 13)) {

			/* If not a power of 2, make it the next power of 2 */

			if (min_region_size & (min_region_size - 1))

				region_size = 1 << fls(region_size);

			DMINFO("Choosing default region size of %lu sectors",

			DMINFO("Choosing default region size of %lu sectors",

			       region_size);

			       region_size);

			region_size = min_region_size;

		} else {

		} else {

			DMINFO("Choosing default region size of 4MiB");

			DMINFO("Choosing default region size of 4MiB");

			region_size = 1 << 13; /* sectors */

			region_size = 1 << 13; /* sectors */