diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2025-02-28 12:37:14 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2025-02-28 12:37:14 +0100 |
| commit | c432bdcf39d52cbba7487d4ebfcf735cee59481e (patch) | |
| tree | 5235fe21993c9fb04cbada15ed940961068258c3 /drivers/md/raid1.c | |
| parent | 36ccabe59ddacefd79b7dfa4a66359385f22eed4 (diff) | |
| parent | d082ecbc71e9e0bf49883ee4afd435a77a5101b6 (diff) | |
| download | lwn-c432bdcf39d52cbba7487d4ebfcf735cee59481e.tar.gz lwn-c432bdcf39d52cbba7487d4ebfcf735cee59481e.zip | |
pmdomain: Merge tag 'v6.14-rc4' from Linus into next
Linux 6.14-rc4
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 9d57a88dbd26..10ea3af40991 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -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); } |