blk-mq: remove blk_qc_t_to_tag and blk_qc_t_is_internal

Merge both functions into their only caller to keep the blk-mq tag to
blk_qc_t mapping as private as possible in blk-mq.c.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Tested-by: Mark Wunderlich <mark.wunderlich@intel.com>
Link: https://lore.kernel.org/r/20211012111226.760968-8-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 6367730..24a10c9 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -74,9 +74,11 @@ static inline struct blk_mq_hw_ctx *blk_qc_to_hctx(struct request_queue *q,
 static inline struct request *blk_qc_to_rq(struct blk_mq_hw_ctx *hctx,
                blk_qc_t qc)
 {
-       if (blk_qc_t_is_internal(qc))
-               return blk_mq_tag_to_rq(hctx->sched_tags, blk_qc_t_to_tag(qc));
-       return blk_mq_tag_to_rq(hctx->tags, blk_qc_t_to_tag(qc));
+       unsigned int tag = qc & ((1U << BLK_QC_T_SHIFT) - 1);
+
+       if (qc & BLK_QC_T_INTERNAL)
+               return blk_mq_tag_to_rq(hctx->sched_tags, tag);
+       return blk_mq_tag_to_rq(hctx->tags, tag);
 }
 
 /*

diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 000351c..fb7c147 100644 (file)
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -505,16 +505,6 @@ static inline bool blk_qc_t_valid(blk_qc_t cookie)
        return cookie != BLK_QC_T_NONE;
 }
 
-static inline unsigned int blk_qc_t_to_tag(blk_qc_t cookie)
-{
-       return cookie & ((1u << BLK_QC_T_SHIFT) - 1);
-}
-
-static inline bool blk_qc_t_is_internal(blk_qc_t cookie)
-{
-       return (cookie & BLK_QC_T_INTERNAL) != 0;
-}
-
 struct blk_rq_stat {
        u64 mean;
        u64 min;