Commit b9d4eee7 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

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: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20241127135133.3952153-4-ming.lei@redhat.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6f491a8d

block/elevator.c

+2 −5
Original line number Diff line number Diff line
@@ -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, "