Unified · Split
| @@ -33,7 +33,7 @@ · 32 unmodified lines | |||
| 33 | 33 | ||
| 34 | #include "blk.h" | 34 | #include "blk.h" |
| 35 | 35 | ||
| 36 | EXPORT_TRACEPOINT_SYMBOL_GPL(block_remap); | 36 | EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_remap); |
| 37 | EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap); | 37 | EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap); |
| 38 | EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete); | 38 | EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete); |
| 39 | 39 | ||
| @@ -1329,9 +1329,9 @@ static inline void blk_partition_remap(struct bio *bio) · 1289 unmodified lines | |||
| 1329 | bio->bi_sector += p->start_sect; | 1329 | bio->bi_sector += p->start_sect; |
| 1330 | bio->bi_bdev = bdev->bd_contains; | 1330 | bio->bi_bdev = bdev->bd_contains; |
| 1331 | 1331 | ||
| 1332 | trace_block_remap(bdev_get_queue(bio->bi_bdev), bio, | 1332 | trace_block_bio_remap(bdev_get_queue(bio->bi_bdev), bio, |
| 1333 | bdev->bd_dev, | 1333 | bdev->bd_dev, |
| 1334 | bio->bi_sector - p->start_sect); | 1334 | bio->bi_sector - p->start_sect); |
| 1335 | } | 1335 | } |
| 1336 | } | 1336 | } |
| 1337 | 1337 | ||
| @@ -1500,7 +1500,7 @@ static inline void __generic_make_request(struct bio *bio) · 162 unmodified lines | |||
| 1500 | goto end_io; | 1500 | goto end_io; |
| 1501 | 1501 | ||
| 1502 | if (old_sector != -1) | 1502 | if (old_sector != -1) |
| 1503 | trace_block_remap(q, bio, old_dev, old_sector); | 1503 | trace_block_bio_remap(q, bio, old_dev, old_sector); |
| 1504 | 1504 | ||
| 1505 | old_sector = bio->bi_sector; | 1505 | old_sector = bio->bi_sector; |
| 1506 | old_dev = bio->bi_bdev->bd_dev; | 1506 | old_dev = bio->bi_bdev->bd_dev; |
| @@ -990,8 +990,8 @@ static void __map_bio(struct dm_target *ti, struct bio *clone, · 989 unmodified lines | |||
| 990 | if (r == DM_MAPIO_REMAPPED) { | 990 | if (r == DM_MAPIO_REMAPPED) { |
| 991 | /* the bio has been remapped so dispatch it */ | 991 | /* the bio has been remapped so dispatch it */ |
| 992 | 992 | ||
| 993 | trace_block_remap(bdev_get_queue(clone->bi_bdev), clone, | 993 | trace_block_bio_remap(bdev_get_queue(clone->bi_bdev), clone, |
| 994 | tio->io->bio->bi_bdev->bd_dev, sector); | 994 | tio->io->bio->bi_bdev->bd_dev, sector); |
| 995 | 995 | ||
| 996 | generic_make_request(clone); | 996 | generic_make_request(clone); |
| 997 | } else if (r < 0 || r == DM_MAPIO_REQUEUE) { | 997 | } else if (r < 0 || r == DM_MAPIO_REQUEUE) { |
| @@ -486,16 +486,16 @@ TRACE_EVENT(block_split, · 485 unmodified lines | |||
| 486 | ); | 486 | ); |
| 487 | 487 | ||
| 488 | /** | 488 | /** |
| 489 | * block_remap - map request for a partition to the raw device | 489 | * block_bio_remap - map request for a logical device to the raw device |
| 490 | * @q: queue holding the operation | 490 | * @q: queue holding the operation |
| 491 | * @bio: revised operation | 491 | * @bio: revised operation |
| 492 | * @dev: device for the operation | 492 | * @dev: device for the operation |
| 493 | * @from: original sector for the operation | 493 | * @from: original sector for the operation |
| 494 | * | 494 | * |
| 495 | * An operation for a partition on a block device has been mapped to the | 495 | * An operation for a logical device has been mapped to the |
| 496 | * raw block device. | 496 | * raw block device. |
| 497 | */ | 497 | */ |
| 498 | TRACE_EVENT(block_remap, | 498 | TRACE_EVENT(block_bio_remap, |
| 499 | 499 | ||
| 500 | TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev, | 500 | TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev, |
| 501 | sector_t from), | 501 | sector_t from), |
| @@ -887,7 +887,7 @@ static void blk_add_trace_split(void *ignore, · 886 unmodified lines | |||
| 887 | } | 887 | } |
| 888 | 888 | ||
| 889 | /** | 889 | /** |
| 890 | * blk_add_trace_remap - Add a trace for a remap operation | 890 | * blk_add_trace_bio_remap - Add a trace for a bio-remap operation |
| 891 | * @ignore: trace callback data parameter (not used) | 891 | * @ignore: trace callback data parameter (not used) |
| 892 | * @q: queue the io is for | 892 | * @q: queue the io is for |
| 893 | * @bio: the source bio | 893 | * @bio: the source bio |
| @@ -899,9 +899,9 @@ static void blk_add_trace_split(void *ignore, · 5 unmodified lines | |||
| 899 | * it spans a stripe (or similar). Add a trace for that action. | 899 | * it spans a stripe (or similar). Add a trace for that action. |
| 900 | * | 900 | * |
| 901 | **/ | 901 | **/ |
| 902 | static void blk_add_trace_remap(void *ignore, | 902 | static void blk_add_trace_bio_remap(void *ignore, |
| 903 | struct request_queue *q, struct bio *bio, | 903 | struct request_queue *q, struct bio *bio, |
| 904 | dev_t dev, sector_t from) | 904 | dev_t dev, sector_t from) |
| 905 | { | 905 | { |
| 906 | struct blk_trace *bt = q->blk_trace; | 906 | struct blk_trace *bt = q->blk_trace; |
| 907 | struct blk_io_trace_remap r; | 907 | struct blk_io_trace_remap r; |
| @@ -1016,7 +1016,7 @@ static void blk_register_tracepoints(void) · 108 unmodified lines | |||
| 1016 | WARN_ON(ret); | 1016 | WARN_ON(ret); |
| 1017 | ret = register_trace_block_split(blk_add_trace_split, NULL); | 1017 | ret = register_trace_block_split(blk_add_trace_split, NULL); |
| 1018 | WARN_ON(ret); | 1018 | WARN_ON(ret); |
| 1019 | ret = register_trace_block_remap(blk_add_trace_remap, NULL); | 1019 | ret = register_trace_block_bio_remap(blk_add_trace_bio_remap, NULL); |
| 1020 | WARN_ON(ret); | 1020 | WARN_ON(ret); |
| 1021 | ret = register_trace_block_rq_remap(blk_add_trace_rq_remap, NULL); | 1021 | ret = register_trace_block_rq_remap(blk_add_trace_rq_remap, NULL); |
| 1022 | WARN_ON(ret); | 1022 | WARN_ON(ret); |
| @@ -1025,7 +1025,7 @@ static void blk_register_tracepoints(void) · 2 unmodified lines | |||
| 1025 | static void blk_unregister_tracepoints(void) | 1025 | static void blk_unregister_tracepoints(void) |
| 1026 | { | 1026 | { |
| 1027 | unregister_trace_block_rq_remap(blk_add_trace_rq_remap, NULL); | 1027 | unregister_trace_block_rq_remap(blk_add_trace_rq_remap, NULL); |
| 1028 | unregister_trace_block_remap(blk_add_trace_remap, NULL); | 1028 | unregister_trace_block_bio_remap(blk_add_trace_bio_remap, NULL); |
| 1029 | unregister_trace_block_split(blk_add_trace_split, NULL); | 1029 | unregister_trace_block_split(blk_add_trace_split, NULL); |
| 1030 | unregister_trace_block_unplug_io(blk_add_trace_unplug_io, NULL); | 1030 | unregister_trace_block_unplug_io(blk_add_trace_unplug_io, NULL); |
| 1031 | unregister_trace_block_unplug_timer(blk_add_trace_unplug_timer, NULL); | 1031 | unregister_trace_block_unplug_timer(blk_add_trace_unplug_timer, NULL); |