| From 66eefe5de11db1e0d8f2edc3880d50e7c36a9d43 Mon Sep 17 00:00:00 2001 |
| From: NeilBrown <neilb@suse.com> |
| Date: Thu, 24 Sep 2015 15:47:47 +1000 |
| Subject: 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 <Jes.Sorensen@redhat.com> |
| Signed-off-by: NeilBrown <neilb@suse.com> |
| Signed-off-by: Zefan Li <lizefan@huawei.com> |
| --- |
| drivers/md/raid0.c | 12 ++++++------ |
| 1 file changed, 6 insertions(+), 6 deletions(-) |
| |
| --- a/drivers/md/raid0.c |
| +++ b/drivers/md/raid0.c |
| @@ -434,18 +434,18 @@ static int raid0_run(struct mddev *mddev |
| struct md_rdev *rdev; |
| bool discard_supported = false; |
| |
| - 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_io_min(mddev->queue, mddev->chunk_sectors << 9); |
| 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 |
