diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-02-07 07:23:03 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-02-07 07:23:03 -0700 |
| commit | 96b531f9bb0da924299d1850bb9b2911f5c0c50a (patch) | |
| tree | 7793d32648e99a2214d26ec94cdf14d616c3a42b | |
| parent | 457bf49627ae19ba789c09e3960ab4cc41d6d129 (diff) | |
| parent | a572593ac80e51eb69ecede7e614289fcccdbf8d (diff) | |
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()
| -rw-r--r-- | drivers/md/md-linear.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/md-linear.c b/drivers/md/md-linear.c index a382929ce7ba..369aed044b40 100644 --- a/drivers/md/md-linear.c +++ b/drivers/md/md-linear.c @@ -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); } |