dm raid: fix random optimal_io_size for raid0

raid_io_hints() was retrieving the number of data stripes used for the
calculation of io_opt from struct r5conf, which is not defined for raid0
mappings.

Base the calculation on the in-core raid_set structure instead.

Also, adjust to use to_bytes() for the sector -> bytes conversion
throughout.

Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c
index 10c136f789b9af3a0aaab00b7a857ed5329a414b..84983549b5e10e70c98ae8aadce7adb1eef2692e 100644 (file)
--- a/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@ -904,7 +904,7 @@ static int validate_region_size(struct raid_set *rs, unsigned long region_size)
        /*
         * Convert sectors to bytes.
         */
-       rs->md.bitmap_info.chunksize = (region_size << 9);
+       rs->md.bitmap_info.chunksize = to_bytes(region_size);
 
        return 0;
 }
@@ -3368,11 +3368,10 @@ static int raid_iterate_devices(struct dm_target *ti,
 static void raid_io_hints(struct dm_target *ti, struct queue_limits *limits)
 {
        struct raid_set *rs = ti->private;
-       unsigned int chunk_size = rs->md.chunk_sectors << 9;
-       struct r5conf *conf = rs->md.private;
+       unsigned int chunk_size = to_bytes(rs->md.chunk_sectors);
 
        blk_limits_io_min(limits, chunk_size);
-       blk_limits_io_opt(limits, chunk_size * (conf->raid_disks - conf->max_degraded));
+       blk_limits_io_opt(limits, chunk_size * mddev_data_stripes(rs));
 }
 
 static void raid_presuspend(struct dm_target *ti)