All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] blokc/blk-merge: remove the next_bvec label in __blk_bios_map_sg()linux-block@vger.kernel.org (open list:BLOCK LAYER)
@ 2020-12-23  4:31 sh
  2020-12-23  5:38 ` Hui Su
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: sh @ 2020-12-23  4:31 UTC (permalink / raw)
  To: Jens Axboe, linux-block, linux-kernel; +Cc: sh_def, songmuchun

remove the next_bvec label in __blk_bios_map_sg(), simplify the logic
of traversal bvec.

Signed-off-by: sh <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



^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-12-30  6:38 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-23  4:31 [PATCH] blokc/blk-merge: remove the next_bvec label in __blk_bios_map_sg()linux-block@vger.kernel.org (open list:BLOCK LAYER) sh
2020-12-23  5:38 ` Hui Su
2020-12-23  8:33 ` Christoph Hellwig
2020-12-23  9:24   ` Hui Su
2020-12-30  6:38 ` [blokc/blk] d9ad3bf8cb: xfstests.generic.299.fail kernel test robot
2020-12-30  6:38   ` kernel test robot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.