From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Jeffle Xu <jefflexu@linux.alibaba.com>,
Ming Lei <ming.lei@redhat.com>,
Damien Le Moal <Damien.LeMoal@wdc.com>,
Keith Busch <kbusch@kernel.org>, Sagi Grimberg <sagi@grimberg.me>,
"Wunderlich, Mark" <mark.wunderlich@intel.com>,
"Vasudevan, Anil" <anil.vasudevan@intel.com>,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-nvme@lists.infradead.org
Subject: [PATCH 07/16] blk-mq: remove blk_qc_t_to_tag and blk_qc_t_is_internal
Date: Tue, 12 Oct 2021 13:12:17 +0200 [thread overview]
Message-ID: <20211012111226.760968-8-hch@lst.de> (raw)
In-Reply-To: <20211012111226.760968-1-hch@lst.de>
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>
---
block/blk-mq.c | 8 +++++---
include/linux/blk_types.h | 10 ----------
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 00bc595d8de6d..3d65e79a11db5 100644
--- 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 000351c5312af..fb7c1477617b8 100644
--- 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;
--
2.30.2
next prev parent reply other threads:[~2021-10-12 11:23 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-12 11:12 switch block layer polling to a bio based model v4 Christoph Hellwig
2021-10-12 11:12 ` [PATCH 01/16] direct-io: remove blk_poll support Christoph Hellwig
2021-10-13 10:42 ` Sagi Grimberg
2021-10-28 1:26 ` Chaitanya Kulkarni
2021-10-12 11:12 ` [PATCH 02/16] block: don't try to poll multi-bio I/Os in __blkdev_direct_IO Christoph Hellwig
2021-10-12 11:12 ` [PATCH 03/16] iomap: don't try to poll multi-bio I/Os in __iomap_dio_rw Christoph Hellwig
2021-10-12 11:12 ` [PATCH 04/16] io_uring: fix a layering violation in io_iopoll_req_issued Christoph Hellwig
2021-10-12 11:12 ` [PATCH 05/16] blk-mq: factor out a blk_qc_to_hctx helper Christoph Hellwig
2021-10-12 11:12 ` [PATCH 06/16] blk-mq: factor out a "classic" poll helper Christoph Hellwig
2021-10-12 11:12 ` Christoph Hellwig [this message]
2021-10-12 11:12 ` [PATCH 08/16] blk-mq: remove blk_qc_t_valid Christoph Hellwig
2021-10-12 11:12 ` [PATCH 09/16] block: replace the spin argument to blk_iopoll with a flags argument Christoph Hellwig
2021-10-13 10:44 ` Sagi Grimberg
2021-10-12 11:12 ` [PATCH 10/16] io_uring: don't sleep when polling for I/O Christoph Hellwig
2021-10-13 10:45 ` Sagi Grimberg
2021-10-12 11:12 ` [PATCH 11/16] block: rename REQ_HIPRI to REQ_POLLED Christoph Hellwig
2021-10-13 10:45 ` Sagi Grimberg
2021-10-12 11:12 ` [PATCH 12/16] block: use SLAB_TYPESAFE_BY_RCU for the bio slab Christoph Hellwig
2021-10-12 11:12 ` [PATCH 13/16] block: define 'struct bvec_iter' as packed Christoph Hellwig
2021-10-12 11:12 ` [PATCH 14/16] block: switch polling to be bio based Christoph Hellwig
2021-10-13 9:59 ` Ming Lei
2021-10-13 10:45 ` Sagi Grimberg
2021-10-15 8:30 ` Pankaj Raghav
2021-10-15 13:24 ` Christoph Hellwig
2021-11-03 7:11 ` chenxiang (M)
2021-11-03 7:22 ` Christoph Hellwig
2021-11-03 8:05 ` chenxiang (M)
2021-10-12 11:12 ` [PATCH 15/16] block: don't allow writing to the poll queue attribute Christoph Hellwig
2021-10-12 11:12 ` [PATCH 16/16] nvme-multipath: enable polled I/O Christoph Hellwig
2021-10-13 10:46 ` Sagi Grimberg
2021-10-12 14:47 ` switch block layer polling to a bio based model v4 Jens Axboe
2021-10-12 14:57 ` Sagi Grimberg
2021-10-12 14:58 ` Jens Axboe
2021-10-12 15:09 ` Sagi Grimberg
2021-10-12 15:06 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211012111226.760968-8-hch@lst.de \
--to=hch@lst.de \
--cc=Damien.LeMoal@wdc.com \
--cc=anil.vasudevan@intel.com \
--cc=axboe@kernel.dk \
--cc=jefflexu@linux.alibaba.com \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=mark.wunderlich@intel.com \
--cc=ming.lei@redhat.com \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).