1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 45d94a7e7f6d..3d8984edeff7 100644
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -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.
                  */
                 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",
                                region_size);
-                        region_size = min_region_size;
                 } else {
                         DMINFO("Choosing default region size of 4MiB");
                         region_size = 1 << 13; /* sectors */
@@ -1216,7 +1218,7 @@ static void raid_dtr(struct dm_target *ti)
         context_free(rs);
 }
 
-static int raid_map(struct dm_target *ti, struct bio *bio, union map_info *map_context)
+static int raid_map(struct dm_target *ti, struct bio *bio)
 {
         struct raid_set *rs = ti->private;
         struct mddev *mddev = &rs->md;
@@ -1430,7 +1432,7 @@ static void raid_resume(struct dm_target *ti)
 
 static struct target_type raid_target = {
         .name = "raid",
-        .version = {1, 3, 1},
+        .version = {1, 4, 0},
         .module = THIS_MODULE,
         .ctr = raid_ctr,
         .dtr = raid_dtr,