提交 d07335e5 编写于 作者: M Mike Snitzer 提交者: Jens Axboe

block: Rename "block_remap" tracepoint to "block_bio_remap" to clarify the event.

Signed-off-by: NKiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: NJun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: NMike Snitzer <snitzer@redhat.com>
Signed-off-by: NJens Axboe <jaxboe@fusionio.com>
上级 5fbf8563
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "blk.h" #include "blk.h"
EXPORT_TRACEPOINT_SYMBOL_GPL(block_remap); EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_remap);
EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap); EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap);
EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete); EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete);
...@@ -1329,9 +1329,9 @@ static inline void blk_partition_remap(struct bio *bio) ...@@ -1329,9 +1329,9 @@ static inline void blk_partition_remap(struct bio *bio)
bio->bi_sector += p->start_sect; bio->bi_sector += p->start_sect;
bio->bi_bdev = bdev->bd_contains; bio->bi_bdev = bdev->bd_contains;
trace_block_remap(bdev_get_queue(bio->bi_bdev), bio, trace_block_bio_remap(bdev_get_queue(bio->bi_bdev), bio,
bdev->bd_dev, bdev->bd_dev,
bio->bi_sector - p->start_sect); bio->bi_sector - p->start_sect);
} }
} }
...@@ -1500,7 +1500,7 @@ static inline void __generic_make_request(struct bio *bio) ...@@ -1500,7 +1500,7 @@ static inline void __generic_make_request(struct bio *bio)
goto end_io; goto end_io;
if (old_sector != -1) if (old_sector != -1)
trace_block_remap(q, bio, old_dev, old_sector); trace_block_bio_remap(q, bio, old_dev, old_sector);
old_sector = bio->bi_sector; old_sector = bio->bi_sector;
old_dev = bio->bi_bdev->bd_dev; old_dev = bio->bi_bdev->bd_dev;
......
...@@ -990,8 +990,8 @@ static void __map_bio(struct dm_target *ti, struct bio *clone, ...@@ -990,8 +990,8 @@ static void __map_bio(struct dm_target *ti, struct bio *clone,
if (r == DM_MAPIO_REMAPPED) { if (r == DM_MAPIO_REMAPPED) {
/* the bio has been remapped so dispatch it */ /* the bio has been remapped so dispatch it */
trace_block_remap(bdev_get_queue(clone->bi_bdev), clone, trace_block_bio_remap(bdev_get_queue(clone->bi_bdev), clone,
tio->io->bio->bi_bdev->bd_dev, sector); tio->io->bio->bi_bdev->bd_dev, sector);
generic_make_request(clone); generic_make_request(clone);
} else if (r < 0 || r == DM_MAPIO_REQUEUE) { } else if (r < 0 || r == DM_MAPIO_REQUEUE) {
......
...@@ -486,16 +486,16 @@ TRACE_EVENT(block_split, ...@@ -486,16 +486,16 @@ TRACE_EVENT(block_split,
); );
/** /**
* block_remap - map request for a partition to the raw device * block_bio_remap - map request for a logical device to the raw device
* @q: queue holding the operation * @q: queue holding the operation
* @bio: revised operation * @bio: revised operation
* @dev: device for the operation * @dev: device for the operation
* @from: original sector for the operation * @from: original sector for the operation
* *
* An operation for a partition on a block device has been mapped to the * An operation for a logical device has been mapped to the
* raw block device. * raw block device.
*/ */
TRACE_EVENT(block_remap, TRACE_EVENT(block_bio_remap,
TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev, TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev,
sector_t from), sector_t from),
......
...@@ -887,7 +887,7 @@ static void blk_add_trace_split(void *ignore, ...@@ -887,7 +887,7 @@ static void blk_add_trace_split(void *ignore,
} }
/** /**
* blk_add_trace_remap - Add a trace for a remap operation * blk_add_trace_bio_remap - Add a trace for a bio-remap operation
* @ignore: trace callback data parameter (not used) * @ignore: trace callback data parameter (not used)
* @q: queue the io is for * @q: queue the io is for
* @bio: the source bio * @bio: the source bio
...@@ -899,9 +899,9 @@ static void blk_add_trace_split(void *ignore, ...@@ -899,9 +899,9 @@ static void blk_add_trace_split(void *ignore,
* it spans a stripe (or similar). Add a trace for that action. * it spans a stripe (or similar). Add a trace for that action.
* *
**/ **/
static void blk_add_trace_remap(void *ignore, static void blk_add_trace_bio_remap(void *ignore,
struct request_queue *q, struct bio *bio, struct request_queue *q, struct bio *bio,
dev_t dev, sector_t from) dev_t dev, sector_t from)
{ {
struct blk_trace *bt = q->blk_trace; struct blk_trace *bt = q->blk_trace;
struct blk_io_trace_remap r; struct blk_io_trace_remap r;
...@@ -1016,7 +1016,7 @@ static void blk_register_tracepoints(void) ...@@ -1016,7 +1016,7 @@ static void blk_register_tracepoints(void)
WARN_ON(ret); WARN_ON(ret);
ret = register_trace_block_split(blk_add_trace_split, NULL); ret = register_trace_block_split(blk_add_trace_split, NULL);
WARN_ON(ret); WARN_ON(ret);
ret = register_trace_block_remap(blk_add_trace_remap, NULL); ret = register_trace_block_bio_remap(blk_add_trace_bio_remap, NULL);
WARN_ON(ret); WARN_ON(ret);
ret = register_trace_block_rq_remap(blk_add_trace_rq_remap, NULL); ret = register_trace_block_rq_remap(blk_add_trace_rq_remap, NULL);
WARN_ON(ret); WARN_ON(ret);
...@@ -1025,7 +1025,7 @@ static void blk_register_tracepoints(void) ...@@ -1025,7 +1025,7 @@ static void blk_register_tracepoints(void)
static void blk_unregister_tracepoints(void) static void blk_unregister_tracepoints(void)
{ {
unregister_trace_block_rq_remap(blk_add_trace_rq_remap, NULL); unregister_trace_block_rq_remap(blk_add_trace_rq_remap, NULL);
unregister_trace_block_remap(blk_add_trace_remap, NULL); unregister_trace_block_bio_remap(blk_add_trace_bio_remap, NULL);
unregister_trace_block_split(blk_add_trace_split, NULL); unregister_trace_block_split(blk_add_trace_split, NULL);
unregister_trace_block_unplug_io(blk_add_trace_unplug_io, NULL); unregister_trace_block_unplug_io(blk_add_trace_unplug_io, NULL);
unregister_trace_block_unplug_timer(blk_add_trace_unplug_timer, NULL); unregister_trace_block_unplug_timer(blk_add_trace_unplug_timer, NULL);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册