Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b441a262e7d1c56fbe21794c91d7a9c83809113f

Authored by Alasdair G Kergon
1 parent 56a67df766
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 5 changed files with 7 additions and 8 deletions Side-by-side Diff

drivers/md/dm-crypt.c
Diff comments   View file @ b441a26
... ... @@ -1284,7 +1284,7 @@
1284 1284 return DM_MAPIO_REMAPPED;
1285 1285 }
1286 1286  
1287   - io = crypt_io_alloc(ti, bio, bio->bi_sector - ti->begin);
  1287 + io = crypt_io_alloc(ti, bio, dm_target_offset(ti, bio->bi_sector));
1288 1288  
1289 1289 if (bio_data_dir(io->base_bio) == READ)
1290 1290 kcryptd_queue_io(io);
... ... @@ -1406,7 +1406,7 @@
1406 1406 return max_size;
1407 1407  
1408 1408 bvm->bi_bdev = cc->dev->bdev;
1409   - bvm->bi_sector = cc->start + bvm->bi_sector - ti->begin;
  1409 + bvm->bi_sector = cc->start + dm_target_offset(ti, bvm->bi_sector);
1410 1410  
1411 1411 return min(max_size, q->merge_bvec_fn(q, bvm, biovec));
1412 1412 }
drivers/md/dm-delay.c
Diff comments   View file @ b441a26
... ... @@ -281,14 +281,13 @@
281 281 bio->bi_bdev = dc->dev_write->bdev;
282 282 if (bio_sectors(bio))
283 283 bio->bi_sector = dc->start_write +
284   - (bio->bi_sector - ti->begin);
  284 + dm_target_offset(ti, bio->bi_sector);
285 285  
286 286 return delay_bio(dc, dc->write_delay, bio);
287 287 }
288 288  
289 289 bio->bi_bdev = dc->dev_read->bdev;
290   - bio->bi_sector = dc->start_read +
291   - (bio->bi_sector - ti->begin);
  290 + bio->bi_sector = dc->start_read + dm_target_offset(ti, bio->bi_sector);
292 291  
293 292 return delay_bio(dc, dc->read_delay, bio);
294 293 }
drivers/md/dm-linear.c
Diff comments   View file @ b441a26
... ... @@ -74,7 +74,7 @@
74 74 {
75 75 struct linear_c *lc = ti->private;
76 76  
77   - return lc->start + (bi_sector - ti->begin);
  77 + return lc->start + dm_target_offset(ti, bi_sector);
78 78 }
79 79  
80 80 static void linear_map_bio(struct dm_target *ti, struct bio *bio)
drivers/md/dm-raid1.c
Diff comments   View file @ b441a26
... ... @@ -445,7 +445,7 @@
445 445 {
446 446 if (unlikely(!bio->bi_size))
447 447 return 0;
448   - return m->offset + (bio->bi_sector - m->ms->ti->begin);
  448 + return m->offset + dm_target_offset(m->ms->ti, bio->bi_sector);
449 449 }
450 450  
451 451 static void map_bio(struct mirror *m, struct bio *bio)
drivers/md/dm-stripe.c
Diff comments   View file @ b441a26
... ... @@ -222,7 +222,7 @@
222 222 return DM_MAPIO_REMAPPED;
223 223 }
224 224  
225   - offset = bio->bi_sector - ti->begin;
  225 + offset = dm_target_offset(ti, bio->bi_sector);
226 226 chunk = offset >> sc->chunk_shift;
227 227 stripe = sector_div(chunk, sc->stripes);
228 228