Commit a88db1e0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: fold __blk_mq_insert_request into blk_mq_insert_request 



There is no good point in keeping the __blk_mq_insert_request around
for two function calls and a singler caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230413064057.707578-8-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2bd215df

block/blk-mq.c

+2 −12
Original line number Diff line number Diff line
@@ -2463,17 +2463,6 @@ static inline void __blk_mq_insert_req_list(struct blk_mq_hw_ctx *hctx, 
		list_add_tail(&rq->queuelist, &ctx->rq_lists[type]);

}



void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,

			     bool at_head)

{

	struct blk_mq_ctx *ctx = rq->mq_ctx;



	lockdep_assert_held(&ctx->lock);



	__blk_mq_insert_req_list(hctx, rq, at_head);

	blk_mq_hctx_mark_pending(hctx, ctx);

}



/**

 * blk_mq_request_bypass_insert - Insert a request at dispatch list.

 * @rq: Pointer to request to be inserted.
@@ -2598,7 +2587,8 @@ static void blk_mq_insert_request(struct request *rq, bool at_head, 
		e->type->ops.insert_requests(hctx, &list, at_head);

	} else {

		spin_lock(&ctx->lock);

		__blk_mq_insert_request(hctx, rq, at_head);

		__blk_mq_insert_req_list(hctx, rq, at_head);

		blk_mq_hctx_mark_pending(hctx, ctx);

		spin_unlock(&ctx->lock);

	}

block/blk-mq.h

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ void blk_mq_free_map_and_rqs(struct blk_mq_tag_set *set, 
/*

 * Internal helpers for request insertion into sw queues

 */

void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,

				bool at_head);

void blk_mq_request_bypass_insert(struct request *rq, bool at_head,

				  bool run_queue);