diff options
| author | NeilBrown <neilb@suse.com> | 2015-09-24 15:47:47 +1000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-11-17 15:54:41 +0000 |
| commit | e1263d46df6f5f96bc6abd039684b7778a72bab3 (patch) | |
| tree | 6beaff68be5225b7ae72008cc5e8698c23a70b61 | |
| parent | 1afa0468d0a71d798b24fc3a81f803aba491d22e (diff) | |
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>
[bwh: Backported to 3.2: the code being moved looks a little different]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/md/raid0.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index 0abae394295f..c0b4a21bb4a5 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -358,16 +358,17 @@ static int raid0_run(struct mddev *mddev) } conf = mddev->private; - list_for_each_entry(rdev, &mddev->disks, same_set) { - disk_stack_limits(mddev->gendisk, rdev->bdev, - rdev->data_offset << 9); - } 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); + list_for_each_entry(rdev, &mddev->disks, same_set) { + disk_stack_limits(mddev->gendisk, rdev->bdev, + rdev->data_offset << 9); + } + /* calculate array device size */ md_set_array_sectors(mddev, raid0_size(mddev, 0, 0)); |