From: Ming Lei <ming.lei@redhat.com>
Date: Wed, 27 Nov 2024 13:51:29 +0000 (+0800)
Subject: block: don't verify queue freeze manually in elevator_init_mq()
X-Git-Tag: v6.14-rc1~202^2~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9d4eee7e04b9cfb0b4bcd748fe6b3ec517171d9;p=thirdparty%2Fkernel%2Flinux.git

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 ca0a74369f1c1..a26b966626202 100644
--- 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, "