Commit 7e923f40 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe

block: Rename a blk_mq_map_queue() argument

Before the introduction of blk_mq_get_hctx_type(), blk_mq_map_queue()
only used the flags from its second argument. Since the introduction of
blk_mq_get_hctx_type(), blk_mq_map_queue() uses both the operation and
the flags encoded in that argument. Rename the second argument of
blk_mq_map_queue() to make this clear.

Cc: Christoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220615225549.1054905-3-bvanassche@acm.orgSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 62c159a0
...@@ -86,16 +86,16 @@ static inline struct blk_mq_hw_ctx *blk_mq_map_queue_type(struct request_queue * ...@@ -86,16 +86,16 @@ static inline struct blk_mq_hw_ctx *blk_mq_map_queue_type(struct request_queue *
return xa_load(&q->hctx_table, q->tag_set->map[type].mq_map[cpu]); return xa_load(&q->hctx_table, q->tag_set->map[type].mq_map[cpu]);
} }
static inline enum hctx_type blk_mq_get_hctx_type(unsigned int flags) static inline enum hctx_type blk_mq_get_hctx_type(unsigned int opf)
{ {
enum hctx_type type = HCTX_TYPE_DEFAULT; enum hctx_type type = HCTX_TYPE_DEFAULT;
/* /*
* The caller ensure that if REQ_POLLED, poll must be enabled. * The caller ensure that if REQ_POLLED, poll must be enabled.
*/ */
if (flags & REQ_POLLED) if (opf & REQ_POLLED)
type = HCTX_TYPE_POLL; type = HCTX_TYPE_POLL;
else if ((flags & REQ_OP_MASK) == REQ_OP_READ) else if ((opf & REQ_OP_MASK) == REQ_OP_READ)
type = HCTX_TYPE_READ; type = HCTX_TYPE_READ;
return type; return type;
} }
...@@ -103,14 +103,14 @@ static inline enum hctx_type blk_mq_get_hctx_type(unsigned int flags) ...@@ -103,14 +103,14 @@ static inline enum hctx_type blk_mq_get_hctx_type(unsigned int flags)
/* /*
* blk_mq_map_queue() - map (cmd_flags,type) to hardware queue * blk_mq_map_queue() - map (cmd_flags,type) to hardware queue
* @q: request queue * @q: request queue
* @flags: request command flags * @opf: operation type (REQ_OP_*) and flags (e.g. REQ_POLLED).
* @ctx: software queue cpu ctx * @ctx: software queue cpu ctx
*/ */
static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q, static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q,
unsigned int flags, unsigned int opf,
struct blk_mq_ctx *ctx) struct blk_mq_ctx *ctx)
{ {
return ctx->hctxs[blk_mq_get_hctx_type(flags)]; return ctx->hctxs[blk_mq_get_hctx_type(opf)];
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment