Skip to content

L
linux-davinci
Commit 0ba459d2 authored by Andre Noll's avatar Andre Noll Committed by NeilBrown
Browse files
Options

md/raid5: Use is_power_of_2() in raid5_reconfig()/raid6_reconfig(). 

Signed-off-by: default avatarAndre Noll <maan@systemlinux.org>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 09c9e5fa
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
drivers/md/raid5.c
View file @ 0ba459d2
...@@ -5167,8 +5167,7 @@ static int raid5_reconfig(mddev_t *mddev, int new_layout, int new_chunk) ...@@ -5167,8 +5167,7 @@ static int raid5_reconfig(mddev_t *mddev, int new_layout, int new_chunk)
if (new_layout >= 0 && !algorithm_valid_raid5(new_layout)) if (new_layout >= 0 && !algorithm_valid_raid5(new_layout))
return -EINVAL; return -EINVAL;
if (new_chunk > 0) { if (new_chunk > 0) {
if (new_chunk & (new_chunk-1)) if (!is_power_of_2(new_chunk))
/* not a power of 2 */
return -EINVAL; return -EINVAL;
if (new_chunk < PAGE_SIZE) if (new_chunk < PAGE_SIZE)
return -EINVAL; return -EINVAL;
...@@ -5206,8 +5205,7 @@ static int raid6_reconfig(mddev_t *mddev, int new_layout, int new_chunk) ...@@ -5206,8 +5205,7 @@ static int raid6_reconfig(mddev_t *mddev, int new_layout, int new_chunk)
if (new_layout >= 0 && !algorithm_valid_raid6(new_layout)) if (new_layout >= 0 && !algorithm_valid_raid6(new_layout))
return -EINVAL; return -EINVAL;
if (new_chunk > 0) { if (new_chunk > 0) {
if (new_chunk & (new_chunk-1)) if (!is_power_of_2(new_chunk))
/* not a power of 2 */
return -EINVAL; return -EINVAL;
if (new_chunk < PAGE_SIZE) if (new_chunk < PAGE_SIZE)
return -EINVAL; return -EINVAL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment