From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org
Subject: [PATCH 4/5] block: move bio_allowed_max_sectors to blk-merge.c
Date: Wed, 20 Jul 2022 16:24:55 +0200 [thread overview]
Message-ID: <20220720142456.1414262-5-hch@lst.de> (raw)
In-Reply-To: <20220720142456.1414262-1-hch@lst.de>
Move this helper into the only file where it is used.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-merge.c | 10 ++++++++++
block/blk.h | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 1676a835b16e7..9593a8a617292 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -95,6 +95,16 @@ static inline bool req_gap_front_merge(struct request *req, struct bio *bio)
return bio_will_gap(req->q, NULL, bio, req->bio);
}
+/*
+ * The max size one bio can handle is UINT_MAX becasue bvec_iter.bi_size
+ * is defined as 'unsigned int', meantime it has to aligned to with logical
+ * block size which is the minimum accepted unit by hardware.
+ */
+static unsigned int bio_allowed_max_sectors(struct request_queue *q)
+{
+ return round_down(UINT_MAX, queue_logical_block_size(q)) >> 9;
+}
+
static struct bio *blk_bio_discard_split(struct request_queue *q,
struct bio *bio,
struct bio_set *bs,
diff --git a/block/blk.h b/block/blk.h
index c4b084bfe87c9..3026ba81c85f0 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -349,16 +349,6 @@ static inline void req_set_nomerge(struct request_queue *q, struct request *req)
q->last_merge = NULL;
}
-/*
- * The max size one bio can handle is UINT_MAX becasue bvec_iter.bi_size
- * is defined as 'unsigned int', meantime it has to aligned to with logical
- * block size which is the minimum accepted unit by hardware.
- */
-static inline unsigned int bio_allowed_max_sectors(struct request_queue *q)
-{
- return round_down(UINT_MAX, queue_logical_block_size(q)) >> 9;
-}
-
/*
* Internal io_context interface
*/
--
2.30.2
next prev parent reply other threads:[~2022-07-20 14:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-20 14:24 bio splitting cleanups Christoph Hellwig
2022-07-20 14:24 ` [PATCH 1/5] block: move ->bio_split to the gendisk Christoph Hellwig
2022-07-22 5:56 ` Damien Le Moal
2022-07-22 6:00 ` Christoph Hellwig
2022-07-20 14:24 ` [PATCH 2/5] block: fix max_zone_append_sectors inheritance in blk_stack_limits Christoph Hellwig
2022-07-22 5:59 ` Damien Le Moal
2022-07-22 6:03 ` Christoph Hellwig
2022-07-20 14:24 ` [PATCH 3/5] block: move the call to get_max_io_size out of blk_bio_segment_split Christoph Hellwig
2022-07-22 6:09 ` Damien Le Moal
2022-07-22 6:11 ` Christoph Hellwig
2022-07-22 6:12 ` Damien Le Moal
2022-07-20 14:24 ` Christoph Hellwig [this message]
2022-07-21 6:31 ` [PATCH 4/5] block: move bio_allowed_max_sectors to blk-merge.c Johannes Thumshirn
2022-07-21 6:42 ` Christoph Hellwig
2022-07-21 6:42 ` Johannes Thumshirn
2022-07-22 6:02 ` Damien Le Moal
2022-07-20 14:24 ` [PATCH 5/5] block: pass struct queue_limits to the bio splitting helpers Christoph Hellwig
2022-07-22 6:08 ` Damien Le Moal
2022-07-21 6:33 ` bio splitting cleanups Johannes Thumshirn
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=20220720142456.1414262-5-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
/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