md/raid*: Fix the set_queue_limits implementations

queue_limits_cancel_update() must only be called if
queue_limits_start_update() is called first. Remove the
queue_limits_cancel_update() calls from the raid*_set_limits() functions
because there is no corresponding queue_limits_start_update() call.

Cc: Christoph Hellwig <hch@lst.de>
Fixes: c6e56cf6b2e7 ("block: move integrity information into queue_limits")
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/linux-raid/20250212171108.3483150-1-bvanassche@acm.org/
Signed-off-by: Yu Kuai <yukuai@kernel.org>

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 8fc9339b00c728f3e46e9b143b35a8af5aeb472b..70bcc3cdf2cd181f88d7ad7151914ba4f373da91 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -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);
 }
 

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 9d57a88dbd261184194545e3565fa6e576396474..10ea3af40991df02050c4698a6bad0e266f4f67e 100644 (file)
--- 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);
 }
 

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index efe93b9791677ed982b76680cd0cb7e9329961be..15b9ae5bf84d8d330b1f9a234205d4d4669f3b02 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -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);
 }