Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

block: blk-mq: make blk_sync_queue support mq 



This patch moves synchronization on mq->delay_work
from blk_mq_free_queue() to blk_sync_queue(), so that
blk_sync_queue can work on mq.

Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarMing Lei <tom.leiming@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 43a5e4e2

block/blk-core.c

+10 −1
Original line number Diff line number Diff line
@@ -246,8 +246,17 @@ EXPORT_SYMBOL(blk_stop_queue); 
void blk_sync_queue(struct request_queue *q)

{

	del_timer_sync(&q->timeout);



	if (q->mq_ops) {

		struct blk_mq_hw_ctx *hctx;

		int i;



		queue_for_each_hw_ctx(q, hctx, i)

			cancel_delayed_work_sync(&hctx->delayed_work);

	} else {

		cancel_delayed_work_sync(&q->delay_work);

	}

}

EXPORT_SYMBOL(blk_sync_queue);



/**

block/blk-mq.c

+0 −1
Original line number Diff line number Diff line
@@ -1440,7 +1440,6 @@ void blk_mq_free_queue(struct request_queue *q) 
	int i;



	queue_for_each_hw_ctx(q, hctx, i) {

		cancel_delayed_work_sync(&hctx->delayed_work);

		kfree(hctx->ctx_map);

		kfree(hctx->ctxs);

		blk_mq_free_rq_map(hctx);