blk-mq: get rid of the dead flush handle code path
authorYufen Yu <yuyufen@huawei.com>
Fri, 9 Oct 2020 03:26:33 +0000 (23:26 -0400)
committerJens Axboe <axboe@kernel.dk>
Fri, 9 Oct 2020 18:35:39 +0000 (12:35 -0600)
After commit 923218f6166a ("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>
block/blk-mq-sched.c

index e7a690a..d1eafe2 100644 (file)
@@ -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)) {