Commit 61667cb6 authored by Guixin Liu's avatar Guixin Liu Committed by Jens Axboe
Browse files

block: remove unused parameter 



The blk_mq_map_queue()'s request_queue param is not used anymore,
remove it, same with blk_get_flush_queue().

Signed-off-by: default avatarGuixin Liu <kanie@linux.alibaba.com>
Link: https://lore.kernel.org/r/20250312084722.129680-1-kanie@linux.alibaba.com


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

block/blk-flush.c

+5 −5
Original line number Diff line number Diff line
@@ -95,9 +95,9 @@ static void blk_kick_flush(struct request_queue *q, 
			   struct blk_flush_queue *fq, blk_opf_t flags);



static inline struct blk_flush_queue *

blk_get_flush_queue(struct request_queue *q, struct blk_mq_ctx *ctx)

blk_get_flush_queue(struct blk_mq_ctx *ctx)

{

	return blk_mq_map_queue(q, REQ_OP_FLUSH, ctx)->fq;

	return blk_mq_map_queue(REQ_OP_FLUSH, ctx)->fq;

}



static unsigned int blk_flush_cur_seq(struct request *rq)
@@ -205,7 +205,7 @@ static enum rq_end_io_ret flush_end_io(struct request *flush_rq, 
	struct list_head *running;

	struct request *rq, *n;

	unsigned long flags = 0;

	struct blk_flush_queue *fq = blk_get_flush_queue(q, flush_rq->mq_ctx);

	struct blk_flush_queue *fq = blk_get_flush_queue(flush_rq->mq_ctx);



	/* release the tag's ownership to the req cloned from */

	spin_lock_irqsave(&fq->mq_flush_lock, flags);
@@ -341,7 +341,7 @@ static enum rq_end_io_ret mq_flush_data_end_io(struct request *rq, 
	struct blk_mq_hw_ctx *hctx = rq->mq_hctx;

	struct blk_mq_ctx *ctx = rq->mq_ctx;

	unsigned long flags;

	struct blk_flush_queue *fq = blk_get_flush_queue(q, ctx);

	struct blk_flush_queue *fq = blk_get_flush_queue(ctx);



	if (q->elevator) {

		WARN_ON(rq->tag < 0);
@@ -382,7 +382,7 @@ static void blk_rq_init_flush(struct request *rq) 
bool blk_insert_flush(struct request *rq)

{

	struct request_queue *q = rq->q;

	struct blk_flush_queue *fq = blk_get_flush_queue(q, rq->mq_ctx);

	struct blk_flush_queue *fq = blk_get_flush_queue(rq->mq_ctx);

	bool supports_fua = q->limits.features & BLK_FEAT_FUA;

	unsigned int policy = 0;

block/blk-mq-sched.c

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ bool blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio, 
	}



	ctx = blk_mq_get_ctx(q);

	hctx = blk_mq_map_queue(q, bio->bi_opf, ctx);

	hctx = blk_mq_map_queue(bio->bi_opf, ctx);

	type = hctx->type;

	if (list_empty_careful(&ctx->rq_lists[type]))

		goto out_put;

block/blk-mq-tag.c

+1 −2
Original line number Diff line number Diff line
@@ -190,8 +190,7 @@ unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data) 
		sbitmap_finish_wait(bt, ws, &wait);



		data->ctx = blk_mq_get_ctx(data->q);

		data->hctx = blk_mq_map_queue(data->q, data->cmd_flags,

						data->ctx);

		data->hctx = blk_mq_map_queue(data->cmd_flags, data->ctx);

		tags = blk_mq_tags_from_data(data);

		if (data->flags & BLK_MQ_REQ_RESERVED)

			bt = &tags->breserved_tags;

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static struct request *__blk_mq_alloc_requests(struct blk_mq_alloc_data *data) 


retry:

	data->ctx = blk_mq_get_ctx(q);

	data->hctx = blk_mq_map_queue(q, data->cmd_flags, data->ctx);

	data->hctx = blk_mq_map_queue(data->cmd_flags, data->ctx);



	if (q->elevator) {

		/*

block/blk-mq.h

+1 −3
Original line number Diff line number Diff line
@@ -100,12 +100,10 @@ static inline enum hctx_type blk_mq_get_hctx_type(blk_opf_t opf) 


/*

 * blk_mq_map_queue() - map (cmd_flags,type) to hardware queue

 * @q: request queue

 * @opf: operation type (REQ_OP_*) and flags (e.g. REQ_POLLED).

 * @ctx: software queue cpu ctx

 */

static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q,

						     blk_opf_t opf,

static inline struct blk_mq_hw_ctx *blk_mq_map_queue(blk_opf_t opf,

						     struct blk_mq_ctx *ctx)

{

	return ctx->hctxs[blk_mq_get_hctx_type(opf)];