From: Hui Su <sh_def@163.com>
To: axboe@kernel.dk, linux-block@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: sh_def@163.com, songmuchun@bytedance.com
Subject: [PATCH v2] blokc/blk-merge: remove the next_bvec label in __blk_bios_map_sg()
Date: Wed, 23 Dec 2020 13:43:17 +0800 [thread overview]
Message-ID: <20201223054317.GA1518010@ubuntu-A520I-AC> (raw)
remove the next_bvec label in __blk_bios_map_sg(),
simplify the logic of traversal bvec.
Signed-off-by: Hui Su <sh_def@163.com>
---
block/blk-merge.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/blk-merge.c b/block/blk-merge.c
index 808768f6b174..aa113cbc0f35 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -494,15 +494,15 @@ static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio,
* to bio
*/
if (new_bio &&
- __blk_segment_map_sg_merge(q, &bvec, &bvprv, sg))
- goto next_bvec;
+ __blk_segment_map_sg_merge(q, &bvec, &bvprv, sg)) {
+ new_bio = false;
+ continue;
+ }
if (bvec.bv_offset + bvec.bv_len <= PAGE_SIZE)
nsegs += __blk_bvec_map_sg(bvec, sglist, sg);
else
nsegs += blk_bvec_map_sg(q, &bvec, sglist, sg);
- next_bvec:
- new_bio = false;
}
if (likely(bio->bi_iter.bi_size)) {
bvprv = bvec;
--
2.25.1
next reply other threads:[~2020-12-23 12:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-23 5:43 Hui Su [this message]
[not found] ` <20201226113133.GC11697@xsang-OptiPlex-9020>
2020-12-28 15:25 ` [blokc/blk] d828aefa7a: xfstests.xfs.372.fail Hui Su
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=20201223054317.GA1518010@ubuntu-A520I-AC \
--to=sh_def@163.com \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=songmuchun@bytedance.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