dm: use dm_target_offset macro

Use new dm_target_offset() macro to avoid most references to ti->begin
in dm targets.

Signed-off-by: Alasdair G Kergon <agk@redhat.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
index 852052880d7..a91049e0521 100644
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
@@ -281,14 +281,13 @@ static int delay_map(struct dm_target *ti, struct bio *bio,
                 bio->bi_bdev = dc->dev_write->bdev;
                 if (bio_sectors(bio))
                         bio->bi_sector = dc->start_write +
-                                         (bio->bi_sector - ti->begin);
+                                         dm_target_offset(ti, bio->bi_sector);
 
                 return delay_bio(dc, dc->write_delay, bio);
         }
 
         bio->bi_bdev = dc->dev_read->bdev;
-        bio->bi_sector = dc->start_read +
-                         (bio->bi_sector - ti->begin);
+        bio->bi_sector = dc->start_read + dm_target_offset(ti, bio->bi_sector);
 
         return delay_bio(dc, dc->read_delay, bio);
 }