Commit c7281524 authored Oct 08, 2020 by Yufen Yu Committed by Jens Axboe Oct 09, 2020

blk-mq: get rid of the dead flush handle code path



After commit 923218f6 ("blk-mq: don't allocate driver tag upfront
for flush rq"), blk_mq_submit_bio() will call blk_insert_flush()
directly to handle flush request rather than blk_mq_sched_insert_request()
in the case of elevator.

Then, all flush request either have set RQF_FLUSH_SEQ flag when call
blk_mq_sched_insert_request(), or have inserted into hctx->dispatch.
So, remove the dead code path.

Signed-off-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 0546858c

block/blk-mq-sched.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -422,12 +422,6 @@ void blk_mq_sched_insert_request(struct request *rq, bool at_head,
		struct blk_mq_ctx *ctx = rq->mq_ctx;
		struct blk_mq_hw_ctx *hctx = rq->mq_hctx;

		/* flush rq in flush machinery need to be dispatched directly */
		if (!(rq->rq_flags & RQF_FLUSH_SEQ) && op_is_flush(rq->cmd_flags)) {
		blk_insert_flush(rq);
		goto run;
		}

		WARN_ON(e && (rq->tag != BLK_MQ_NO_TAG));

		if (blk_mq_sched_bypass_insert(hctx, !!e, rq)) {

Admin message