Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66eefe5d authored by NeilBrown's avatar NeilBrown
Browse files

md/raid0: apply base queue limits *before* disk_stack_limits 



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: 199dc6ed ("md/raid0: update queue parameter in a safer location.")
Cc: stable@vger.kernel.org (v2.6.35+ - please apply with 199dc6ed).
Reported-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parent 36707bb2

drivers/md/raid0.c

+6 −6
Original line number Diff line number Diff line
@@ -376,12 +376,6 @@ 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_max_write_same_sectors(mddev->queue, mddev->chunk_sectors);

		blk_queue_max_discard_sectors(mddev->queue, mddev->chunk_sectors);
@@ -390,6 +384,12 @@ 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