dm: simplify basic targets

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

Signed-off-by: Mike Snitzer <snitzer@kernel.org>

diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
index 9a51bf51a859f95663dc5e264e143b56f60e2edf..869afef5654aede13111319f34d5d214c7479759 100644 (file)
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
@@ -296,8 +296,7 @@ static int delay_map(struct dm_target *ti, struct bio *bio)
        }
        delayed->class = c;
        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);
 }

diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c
index 345229d7e59c1747fb9b89c672d56c6969c9e799..f2305eb758a25e637f44f8c05d1d95be59db56d8 100644 (file)
--- a/drivers/md/dm-flakey.c
+++ b/drivers/md/dm-flakey.c
@@ -280,9 +280,7 @@ static void flakey_map_bio(struct dm_target *ti, struct bio *bio)
        struct flakey_c *fc = ti->private;
 
        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)

diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 76b486e4d2be19697cffcbf8b7029f85884b7c5e..0a6abbbe3745274e5118b0ee89fdce62b86247ab 100644 (file)
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -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);
 }
 
-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;
 
        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);
-}
-
-static int linear_map(struct dm_target *ti, struct bio *bio)
-{
-       linear_map_bio(ti, bio);
+       bio->bi_iter.bi_sector = linear_map_sector(ti, bio->bi_iter.bi_sector);
 
        return DM_MAPIO_REMAPPED;
 }