diff options
| author |   Mikulas Patocka <mpatocka@redhat.com> | 2015-10-02 11:17:37 -0400 |
|---|---|---|
| committer |   Mike Snitzer <snitzer@redhat.com> | 2015-10-02 12:02:31 -0400 |
| commit | 042745ee53a0a7c1f5aff191a4a24213c6dcfb52 (patch) | |
| tree | 623f271b1b370a493b1c2adc9c0b2734749a934c /drivers/md/dm-raid.c | |
| parent | dm: fix AB-BA deadlock in __dm_destroy() (diff) | |
| download | linux-dev-042745ee53a0a7c1f5aff191a4a24213c6dcfb52.tar.xz linux-dev-042745ee53a0a7c1f5aff191a4a24213c6dcfb52.zip | |
dm raid: fix round up of default region size
Commit 3a0f9aaee028 ("dm raid: round region_size to power of two")
intended to make sure that the default region size is a power of two.
However, the logic in that commit is incorrect and sets the variable
region_size to 0 or 1, depending on whether min_region_size is a power
of two.
Fix this logic, using roundup_pow_of_two(), so that region_size is
properly rounded up to the next power of two.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Fixes: 3a0f9aaee028 ("dm raid: round region_size to power of two")
Cc: stable@vger.kernel.org # v3.8+
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-raid.c')
| -rw-r--r-- | drivers/md/dm-raid.c | 3 |
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 { |