@@ -1241,15 +1241,6 @@ static void alloc_multiple_bios(struct bio_list *blist, struct clone_info *ci,
struct bio *bio;
int try;
- if (!num_bios)
- return;
-
- if (num_bios == 1) {
- bio = alloc_tio(ci, ti, 0, len, GFP_NOIO);
- bio_list_add(blist, bio);
- return;
- }
-
for (try = 0; try < 2; try++) {
int bio_nr;
@@ -1279,12 +1270,23 @@ static void __send_duplicate_bios(struct clone_info *ci, struct dm_target *ti,
struct bio_list blist = BIO_EMPTY_LIST;
struct bio *clone;
- alloc_multiple_bios(&blist, ci, ti, num_bios, len);
-
- while ((clone = bio_list_pop(&blist))) {
+ switch (num_bios) {
+ case 0:
+ break;
+ case 1:
+ clone = alloc_tio(ci, ti, 0, len, GFP_NOIO);
if (len)
bio_setup_sector(clone, ci->sector, *len);
__map_bio(clone);
+ break;
+ default:
+ alloc_multiple_bios(&blist, ci, ti, num_bios, len);
+ while ((clone = bio_list_pop(&blist))) {
+ if (len)
+ bio_setup_sector(clone, ci->sector, *len);
+ __map_bio(clone);
+ }
+ break;
}
}
Most targets just need a single flush bio. Open code that case in __send_duplicate_bios without the need to add the bio to a list. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/md/dm.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)