Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d07335e5 authored by Mike Snitzer's avatar Mike Snitzer Committed by Jens Axboe
Browse files

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

parent 5fbf8563
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@

#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_bio_complete);

@@ -1329,7 +1329,7 @@ static inline void blk_partition_remap(struct bio *bio)
		bio->bi_sector += p->start_sect;
		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,
				      bio->bi_sector - p->start_sect);
	}
@@ -1500,7 +1500,7 @@ static inline void __generic_make_request(struct bio *bio)
			goto end_io;

		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_dev = bio->bi_bdev->bd_dev;
+2 −2
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ static void __map_bio(struct dm_target *ti, struct bio *clone,
	if (r == DM_MAPIO_REMAPPED) {
		/* 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);

		generic_make_request(clone);
+3 −3
Original line number Diff line number Diff line
@@ -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
 * @bio: revised operation
 * @dev: device 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.
 */
TRACE_EVENT(block_remap,
TRACE_EVENT(block_bio_remap,

	TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev,
		 sector_t from),
+6 −6
Original line number Diff line number Diff line
@@ -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)
 * @q:		queue the io is for
 * @bio:	the source bio
@@ -899,7 +899,7 @@ static void blk_add_trace_split(void *ignore,
 *     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,
				    dev_t dev, sector_t from)
{
@@ -1016,7 +1016,7 @@ static void blk_register_tracepoints(void)
	WARN_ON(ret);
	ret = register_trace_block_split(blk_add_trace_split, NULL);
	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);
	ret = register_trace_block_rq_remap(blk_add_trace_rq_remap, NULL);
	WARN_ON(ret);
@@ -1025,7 +1025,7 @@ static void blk_register_tracepoints(void)
static void blk_unregister_tracepoints(void)
{
	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_unplug_io(blk_add_trace_unplug_io, NULL);
	unregister_trace_block_unplug_timer(blk_add_trace_unplug_timer, NULL);