Commit 96b531f9 authored by Jens Axboe's avatar Jens Axboe
Browse files

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

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

Pull MD fix from Song:

"This patch, by Bart Van Assche, fixes an error handling path for
 md-linear."

* tag 'md-6.14-20250206' of https://git.kernel.org/pub/scm/linux/kernel/git/mdraid/linux:
  md: Fix linear_set_limits()
parents 457bf496 a572593a

drivers/md/md-linear.c

+1 −3
Original line number Diff line number Diff line
@@ -76,10 +76,8 @@ static int linear_set_limits(struct mddev *mddev) 
	lim.max_write_zeroes_sectors = mddev->chunk_sectors;

	lim.io_min = mddev->chunk_sectors << 9;

	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);

}