Commit 7543095c authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'md-6.14-20250218' of... 

Merge tag 'md-6.14-20250218' of https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux into block-6.14

Pull MD fix from Yu:

"This patch, by Bart Van Assche, fixes queue limits error handling for
 raid0, raid1 and raid10."

* tag 'md-6.14-20250218' of https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux:
  md/raid*: Fix the set_queue_limits implementations
parents dd8b0582 fbe8f2fa

drivers/md/raid0.c

+1 −3
Original line number Diff line number Diff line
@@ -386,10 +386,8 @@ static int raid0_set_limits(struct mddev *mddev) 
	lim.io_opt = lim.io_min * mddev->raid_disks;

	lim.features |= BLK_FEAT_ATOMIC_WRITES;

	err = mddev_stack_rdev_limits(mddev, &lim, MDDEV_STACK_INTEGRITY);

	if (err) {

		queue_limits_cancel_update(mddev->gendisk->queue);

	if (err)

		return err;

	}

	return queue_limits_set(mddev->gendisk->queue, &lim);

}

drivers/md/raid1.c

+1 −3
Original line number Diff line number Diff line
@@ -3219,10 +3219,8 @@ static int raid1_set_limits(struct mddev *mddev) 
	lim.max_write_zeroes_sectors = 0;

	lim.features |= BLK_FEAT_ATOMIC_WRITES;

	err = mddev_stack_rdev_limits(mddev, &lim, MDDEV_STACK_INTEGRITY);

	if (err) {

		queue_limits_cancel_update(mddev->gendisk->queue);

	if (err)

		return err;

	}

	return queue_limits_set(mddev->gendisk->queue, &lim);

}

drivers/md/raid10.c

+1 −3
Original line number Diff line number Diff line
@@ -4020,10 +4020,8 @@ static int raid10_set_queue_limits(struct mddev *mddev) 
	lim.io_opt = lim.io_min * raid10_nr_stripes(conf);

	lim.features |= BLK_FEAT_ATOMIC_WRITES;

	err = mddev_stack_rdev_limits(mddev, &lim, MDDEV_STACK_INTEGRITY);

	if (err) {

		queue_limits_cancel_update(mddev->gendisk->queue);

	if (err)

		return err;

	}

	return queue_limits_set(mddev->gendisk->queue, &lim);

}