md/raid*: Fix the set_queue_limits implementations

[ Upstream commit fbe8f2fa971c537571994a0df532c511c4fb5537 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 32d58752477847cf1db73e261992948a95c0e2cd..31bea72bcb01ad6c160554cd05b114240056bdfa 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -385,10 +385,8 @@ static int raid0_set_limits(struct mddev *mddev)
        lim.io_min = mddev->chunk_sectors << 9;
        lim.io_opt = lim.io_min * mddev->raid_disks;
        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 d83fe3b3abc00975ca4edb77855370241f969fc1..8a994a1975ca7b4d2e0d60c54d2330c03d94d495 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -3171,10 +3171,8 @@ static int raid1_set_limits(struct mddev *mddev)
        md_init_stacking_limits(&lim);
        lim.max_write_zeroes_sectors = 0;
        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 daf42acc4fb6f3500e1186705c225c039dc3de90..a214fed4f16226b3eace63a73a707481dfcefd39 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3963,10 +3963,8 @@ static int raid10_set_queue_limits(struct mddev *mddev)
        lim.io_min = mddev->chunk_sectors << 9;
        lim.io_opt = lim.io_min * raid10_nr_stripes(conf);
        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);
 }