From: Christoph Hellwig <hch@lst.de>
To: axboe@fb.com
Cc: ming.lei@redhat.com, Matias Bjorling <mb@lightnvm.io>,
linux-block@vger.kernel.org
Subject: [PATCH 09/10] block: untangle the end of blk_bio_segment_split
Date: Mon, 13 May 2019 08:37:53 +0200 [thread overview]
Message-ID: <20190513063754.1520-10-hch@lst.de> (raw)
In-Reply-To: <20190513063754.1520-1-hch@lst.de>
Now that we don't need to assign the front/back segment sizes, we can
duplicating the segs assignment for the split vs no-split case and
remove a whole chunk of boilerplate code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/blk-merge.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 2ea21ffd5f72..ca45eb51c669 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -202,8 +202,6 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
struct bio_vec bv, bvprv, *bvprvp = NULL;
struct bvec_iter iter;
unsigned nsegs = 0, sectors = 0;
- bool do_split = true;
- struct bio *new = NULL;
const unsigned max_sectors = get_max_io_size(q, bio);
const unsigned max_segs = queue_max_segments(q);
@@ -245,17 +243,11 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
}
}
- do_split = false;
+ *segs = nsegs;
+ return NULL;
split:
*segs = nsegs;
-
- if (do_split) {
- new = bio_split(bio, sectors, GFP_NOIO, bs);
- if (new)
- bio = new;
- }
-
- return do_split ? new : NULL;
+ return bio_split(bio, sectors, GFP_NOIO, bs);
}
void __blk_queue_split(struct request_queue *q, struct bio **bio,
--
2.20.1
next prev parent reply other threads:[~2019-05-13 6:39 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-13 6:37 fix nr_phys_segments vs iterators accounting Christoph Hellwig
2019-05-13 6:37 ` [PATCH 01/10] block: don't decrement nr_phys_segments for physically contigous segments Christoph Hellwig
2019-05-13 9:45 ` Ming Lei
2019-05-13 12:03 ` Christoph Hellwig
2019-05-13 12:37 ` Christoph Hellwig
2019-05-14 4:36 ` Ming Lei
2019-05-14 5:14 ` Christoph Hellwig
2019-05-14 9:05 ` Ming Lei
2019-05-14 13:51 ` Christoph Hellwig
2019-05-14 13:57 ` Hannes Reinecke
2019-05-14 14:27 ` Ming Lei
2019-05-14 14:31 ` Christoph Hellwig
2019-05-14 14:32 ` Christoph Hellwig
2019-05-13 6:37 ` [PATCH 02/10] block: force an unlimited segment size on queues with a virt boundary Christoph Hellwig
2019-05-15 8:19 ` Ming Lei
2019-05-13 6:37 ` [PATCH 03/10] block: remove the segment size check in bio_will_gap Christoph Hellwig
2019-05-15 8:34 ` Ming Lei
2019-05-13 6:37 ` [PATCH 04/10] block: remove the bi_seg_{front,back}_size fields in struct bio Christoph Hellwig
2019-05-13 6:37 ` [PATCH 05/10] block: initialize the write priority in blk_rq_bio_prep Christoph Hellwig
2019-05-13 15:04 ` Chaitanya Kulkarni
2019-05-13 6:37 ` [PATCH 06/10] block: remove blk_init_request_from_bio Christoph Hellwig
2019-05-13 6:37 ` [PATCH 07/10] block: remove the bi_phys_segments field in struct bio Christoph Hellwig
2019-05-13 6:37 ` [PATCH 08/10] block: simplify blk_recalc_rq_segments Christoph Hellwig
2019-05-13 6:37 ` Christoph Hellwig [this message]
2019-05-13 6:37 ` [PATCH 10/10] block: mark blk_rq_bio_prep as inline Christoph Hellwig
2019-05-13 14:57 ` Chaitanya Kulkarni
[not found] ` <CGME20190513063855epcas5p33ef8c4c0a0055bd0b66eadc859796f0f@epcms2p6>
2019-05-13 7:34 ` [PATCH 05/10] block: initialize the write priority in blk_rq_bio_prep Minwoo Im
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=20190513063754.1520-10-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@fb.com \
--cc=linux-block@vger.kernel.org \
--cc=mb@lightnvm.io \
--cc=ming.lei@redhat.com \
/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).