block: don't verify queue freeze manually in elevator_init_mq()

Now blk_freeze_queue_start() can track disk state automatically, and
it isn't necessary to verify queue freeze manually in elevator_init_mq()
any more.

Signed-off-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20241127135133.3952153-4-ming.lei@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/elevator.c b/block/elevator.c
index ca0a74369f1c13e82cf5be907328d5250e7a1044..a26b966626202b54effdccc3d2c91abe68599ecc 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -601,16 +601,13 @@ void elevator_init_mq(struct request_queue *q)
         *
         * Disk isn't added yet, so verifying queue lock only manually.
         */
-       blk_freeze_queue_start_non_owner(q);
-       blk_freeze_acquire_lock(q, false);
-       blk_mq_freeze_queue_wait(q);
+       blk_mq_freeze_queue(q);
 
        blk_mq_cancel_work_sync(q);
 
        err = blk_mq_init_sched(q, e);
 
-       blk_unfreeze_release_lock(q, false);
-       blk_mq_unfreeze_queue_non_owner(q);
+       blk_mq_unfreeze_queue(q);
 
        if (err) {
                pr_warn("\"%s\" elevator initialization failed, "