Skip to content

Commit 96b531f

Browse files
committed
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()
2 parents 457bf49 + a572593 commit 96b531f

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/md/md-linear.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,8 @@ static int linear_set_limits(struct mddev *mddev)
7676
lim.max_write_zeroes_sectors = mddev->chunk_sectors;
7777
lim.io_min = mddev->chunk_sectors << 9;
7878
err = mddev_stack_rdev_limits(mddev, &lim, MDDEV_STACK_INTEGRITY);
79-
if (err) {
80-
queue_limits_cancel_update(mddev->gendisk->queue);
79+
if (err)
8180
return err;
82-
}
8381

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

0 commit comments

Comments
 (0)