Commit 219cf43c authored Oct 30, 2022 by Jinlong Chen Committed by Jens Axboe Oct 31, 2022

blk-mq: move queue_is_mq out of blk_mq_cancel_work_sync



The only caller that needs queue_is_mq check is del_gendisk, so move the
check into it.

Signed-off-by: Jinlong Chen <nickyc975@zju.edu.cn>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20221030094730.1275463-1-nickyc975@zju.edu.cn


Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent adff2158

block/blk-mq.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -4883,7 +4883,6 @@ EXPORT_SYMBOL(blk_mq_rq_cpu);

		void blk_mq_cancel_work_sync(struct request_queue *q)
		{
		if (queue_is_mq(q)) {
		struct blk_mq_hw_ctx *hctx;
		unsigned long i;

		@@ -4892,7 +4891,6 @@ void blk_mq_cancel_work_sync(struct request_queue *q)
		queue_for_each_hw_ctx(q, hctx, i)
		cancel_delayed_work_sync(&hctx->run_work);
		}
		}

		static int __init blk_mq_init(void)
		{

block/genhd.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -638,6 +638,8 @@ void del_gendisk(struct gendisk *disk)

		blk_sync_queue(q);
		blk_flush_integrity();

		if (queue_is_mq(q))
		blk_mq_cancel_work_sync(q);

		blk_mq_quiesce_queue(q);