aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Lei <ming.lei@redhat.com>2024-11-27 21:51:29 +0800
committerJens Axboe <axboe@kernel.dk>2024-12-23 08:17:22 -0700
commitb9d4eee7e04b9cfb0b4bcd748fe6b3ec517171d9 (patch)
tree6f33b37b667bd41e89495924634238dddfce0521
parentblock: track disk DEAD state automatically for modeling queue freeze lockdep (diff)
downloadlinux-b9d4eee7e04b9cfb0b4bcd748fe6b3ec517171d9.tar.gz
linux-b9d4eee7e04b9cfb0b4bcd748fe6b3ec517171d9.zip
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>
-rw-r--r--block/elevator.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/block/elevator.c b/block/elevator.c
index ca0a74369f1c..a26b96662620 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, "