From: Christoph Hellwig <hch@lst.de>
Date: Wed, 2 Feb 2022 17:01:00 +0100
Subject: [PATCH] dm: fold __send_duplicate_bios into
__clone_and_map_simple_bio
Git-commit: 8eabf5d0a7bd9226d6cc25402dde67f372aae838
Patch-mainline: v5.18-rc1
References: jsc#PED-1183
Fold __send_duplicate_bios into its only caller to prepare for
refactoring.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Snitzer <snitzer@redhat.com>
Link: https://lore.kernel.org/r/20220202160109.108149-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Acked-by: Hannes Reinecke <hare@suse.com>
---
drivers/md/dm.c | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 9384d250a3e4..2527b287ead0 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1273,29 +1273,24 @@ static void alloc_multiple_bios(struct bio_list *blist, struct clone_info *ci,
}
}
-static void __clone_and_map_simple_bio(struct clone_info *ci,
- struct dm_target_io *tio, unsigned *len)
-{
- struct bio *clone = &tio->clone;
-
- tio->len_ptr = len;
-
- __bio_clone_fast(clone, ci->bio);
- if (len)
- bio_setup_sector(clone, ci->sector, *len);
- __map_bio(tio);
-}
-
static void __send_duplicate_bios(struct clone_info *ci, struct dm_target *ti,
unsigned num_bios, unsigned *len)
{
struct bio_list blist = BIO_EMPTY_LIST;
- struct bio *bio;
+ struct bio *clone;
alloc_multiple_bios(&blist, ci, ti, num_bios);
- while ((bio = bio_list_pop(&blist)))
- __clone_and_map_simple_bio(ci, clone_to_tio(bio), len);
+ while ((clone = bio_list_pop(&blist))) {
+ struct dm_target_io *tio = clone_to_tio(clone);
+
+ tio->len_ptr = len;
+
+ __bio_clone_fast(clone, ci->bio);
+ if (len)
+ bio_setup_sector(clone, ci->sector, *len);
+ __map_bio(tio);
+ }
}
static int __send_empty_flush(struct clone_info *ci)
--
2.35.3