blk-mq: fold __blk_mq_insert_req_list into blk_mq_insert_request

Remove this very small helper and fold it into the only caller.

Note that this moves the trace_block_rq_insert out of ctx->lock, matching
the other calls to this tracepoint.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230413064057.707578-9-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 103caf1bae276928de9a360a8d51d54a5dd78c20..7e9f7d00452f11980e7735e1ea18a67450d2b3da 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2446,23 +2446,6 @@ static void blk_mq_run_work_fn(struct work_struct *work)
        __blk_mq_run_hw_queue(hctx);
 }
 
-static inline void __blk_mq_insert_req_list(struct blk_mq_hw_ctx *hctx,
-                                           struct request *rq,
-                                           bool at_head)
-{
-       struct blk_mq_ctx *ctx = rq->mq_ctx;
-       enum hctx_type type = hctx->type;
-
-       lockdep_assert_held(&ctx->lock);
-
-       trace_block_rq_insert(rq);
-
-       if (at_head)
-               list_add(&rq->queuelist, &ctx->rq_lists[type]);
-       else
-               list_add_tail(&rq->queuelist, &ctx->rq_lists[type]);
-}
-
 /**
  * blk_mq_request_bypass_insert - Insert a request at dispatch list.
  * @rq: Pointer to request to be inserted.
@@ -2586,8 +2569,14 @@ static void blk_mq_insert_request(struct request *rq, bool at_head,
                list_add(&rq->queuelist, &list);
                e->type->ops.insert_requests(hctx, &list, at_head);
        } else {
+               trace_block_rq_insert(rq);
+
                spin_lock(&ctx->lock);
-               __blk_mq_insert_req_list(hctx, rq, at_head);
+               if (at_head)
+                       list_add(&rq->queuelist, &ctx->rq_lists[hctx->type]);
+               else
+                       list_add_tail(&rq->queuelist,
+                                     &ctx->rq_lists[hctx->type]);
                blk_mq_hctx_mark_pending(hctx, ctx);
                spin_unlock(&ctx->lock);
        }