Commit 77c11720 authored by Mike Snitzer's avatar Mike Snitzer
Browse files

dm: remove legacy code only needed before submit_bio recursion 



Commit 8615cb65 ("dm: remove useless loop in
__split_and_process_bio") showcased that we no longer loop.

Remove the bio_advance() in __split_and_process_bio() that was only
needed when looping was possible.

Similarly there is no need to advance the bio, using ci->sector
cursor, in __send_duplicate_bios().

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 0119ab14

drivers/md/dm.c

+2 −9
Original line number Diff line number Diff line
@@ -1195,12 +1195,6 @@ static void __map_bio(struct bio *clone) 
	}

}



static void bio_setup_sector(struct bio *bio, sector_t sector, unsigned len)

{

	bio->bi_iter.bi_sector = sector;

	bio->bi_iter.bi_size = to_bytes(len);

}



static void alloc_multiple_bios(struct bio_list *blist, struct clone_info *ci,

				struct dm_target *ti, unsigned num_bios,

				unsigned *len)
@@ -1243,14 +1237,14 @@ static void __send_duplicate_bios(struct clone_info *ci, struct dm_target *ti, 
	case 1:

		clone = alloc_tio(ci, ti, 0, len, GFP_NOIO);

		if (len)

			bio_setup_sector(clone, ci->sector, *len);

			clone->bi_iter.bi_size = to_bytes(*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);

				clone->bi_iter.bi_size = to_bytes(*len);

			__map_bio(clone);

		}

		break;
@@ -1369,7 +1363,6 @@ static int __split_and_process_bio(struct clone_info *ci) 
	len = min_t(sector_t, max_io_len(ti, ci->sector), ci->sector_count);



	clone = alloc_tio(ci, ti, 0, &len, GFP_NOIO);

	bio_advance(clone, to_bytes(ci->sector - clone->bi_iter.bi_sector));

	clone->bi_iter.bi_size = to_bytes(len);

	if (bio_integrity(clone))

		bio_integrity_trim(clone);