Commit e86f2b00 authored by Mike Snitzer's avatar Mike Snitzer
Browse files

dm: simplify basic targets 



Remove needless factoring and remap bi_sector regardless of
bio_sectors() being non-zero.

Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
parent 442761fd

drivers/md/dm-delay.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -296,7 +296,6 @@ static int delay_map(struct dm_target *ti, struct bio *bio) 
	}

	}

	delayed->class = c;

	delayed->class = c;

	bio_set_dev(bio, c->dev->bdev);

	bio_set_dev(bio, c->dev->bdev);

	if (bio_sectors(bio))

	bio->bi_iter.bi_sector = c->start + dm_target_offset(ti, bio->bi_iter.bi_sector);

	bio->bi_iter.bi_sector = c->start + dm_target_offset(ti, bio->bi_iter.bi_sector);





	return delay_bio(dc, c, bio);

	return delay_bio(dc, c, bio);

drivers/md/dm-flakey.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -280,9 +280,7 @@ static void flakey_map_bio(struct dm_target *ti, struct bio *bio) 
	struct flakey_c *fc = ti->private;

	struct flakey_c *fc = ti->private;





	bio_set_dev(bio, fc->dev->bdev);

	bio_set_dev(bio, fc->dev->bdev);

	if (bio_sectors(bio) || op_is_zone_mgmt(bio_op(bio)))

	bio->bi_iter.bi_sector = flakey_map_sector(ti, bio->bi_iter.bi_sector);

		bio->bi_iter.bi_sector =

			flakey_map_sector(ti, bio->bi_iter.bi_sector);

}

}





static void corrupt_bio_data(struct bio *bio, struct flakey_c *fc)

static void corrupt_bio_data(struct bio *bio, struct flakey_c *fc)

drivers/md/dm-linear.c

+2 −9
Original line number Original line Diff line number Diff line
@@ -84,19 +84,12 @@ static sector_t linear_map_sector(struct dm_target *ti, sector_t bi_sector) 
	return lc->start + dm_target_offset(ti, bi_sector);

	return lc->start + dm_target_offset(ti, bi_sector);

}

}





static void linear_map_bio(struct dm_target *ti, struct bio *bio)

static int linear_map(struct dm_target *ti, struct bio *bio)

{

{

	struct linear_c *lc = ti->private;

	struct linear_c *lc = ti->private;





	bio_set_dev(bio, lc->dev->bdev);

	bio_set_dev(bio, lc->dev->bdev);

	if (bio_sectors(bio) || op_is_zone_mgmt(bio_op(bio)))

	bio->bi_iter.bi_sector = linear_map_sector(ti, bio->bi_iter.bi_sector);

		bio->bi_iter.bi_sector =

			linear_map_sector(ti, bio->bi_iter.bi_sector);

}



static int linear_map(struct dm_target *ti, struct bio *bio)

{

	linear_map_bio(ti, bio);





	return DM_MAPIO_REMAPPED;

	return DM_MAPIO_REMAPPED;

}

}