From: NeilBrown Date: Thu, 24 Sep 2015 05:47:47 +0000 (+1000) Subject: md/raid0: apply base queue limits *before* disk_stack_limits X-Git-Tag: v3.16.35~956 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4c9d9e8b144be3e494eba1a4cbbc1bf9bb250c1;p=thirdparty%2Fkernel%2Fstable.git md/raid0: apply base queue limits *before* disk_stack_limits commit 66eefe5de11db1e0d8f2edc3880d50e7c36a9d43 upstream. Calling e.g. blk_queue_max_hw_sectors() after calls to disk_stack_limits() discards the settings determined by disk_stack_limits(). So we need to make those calls first. Fixes: 199dc6ed5179 ("md/raid0: update queue parameter in a safer location.") Reported-by: Jes Sorensen Signed-off-by: NeilBrown [ luis: backported to 3.16: adjusted context ] Signed-off-by: Luis Henriques --- diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index 3d6b97b6dc6f1..8f7dfc58f9657 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -437,12 +437,6 @@ static int raid0_run(struct mddev *mddev) mddev->private = conf; } conf = mddev->private; - rdev_for_each(rdev, mddev) { - disk_stack_limits(mddev->gendisk, rdev->bdev, - rdev->data_offset << 9); - if (blk_queue_discard(bdev_get_queue(rdev->bdev))) - discard_supported = true; - } blk_queue_max_hw_sectors(mddev->queue, mddev->chunk_sectors); blk_queue_max_write_same_sectors(mddev->queue, mddev->chunk_sectors); blk_queue_max_discard_sectors(mddev->queue, mddev->chunk_sectors); @@ -451,6 +445,13 @@ static int raid0_run(struct mddev *mddev) blk_queue_io_opt(mddev->queue, (mddev->chunk_sectors << 9) * mddev->raid_disks); + rdev_for_each(rdev, mddev) { + disk_stack_limits(mddev->gendisk, rdev->bdev, + rdev->data_offset << 9); + if (blk_queue_discard(bdev_get_queue(rdev->bdev))) + discard_supported = true; + } + if (!discard_supported) queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, mddev->queue); else