summaryrefslogtreecommitdiff
path: root/drivers/md/dm-raid.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-10-12 14:52:34 +0200
committerIngo Molnar <mingo@kernel.org>2015-10-12 14:52:34 +0200
commitcdbcd239e2e264dc3ef7bc7865bcb8ec0023876f (patch)
tree94f5d2cf92ebb2eee640862cb2beaab6503bf846 /drivers/md/dm-raid.c
parent6e06780a98f149f131d46c1108d4ae27f05a9357 (diff)
parent7e0abcd6b7ec1452bf4a850fccbae44043c05806 (diff)
Merge branch 'x86/ras' into ras/core, to pick up changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/md/dm-raid.c')
-rw-r--r--drivers/md/dm-raid.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 97e165183e79..a0901214aef5 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -329,8 +329,7 @@ static int validate_region_size(struct raid_set *rs, unsigned long region_size)
*/
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);
+ region_size = roundup_pow_of_two(min_region_size);
DMINFO("Choosing default region size of %lu sectors",
region_size);
} else {