aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/dm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/md/dm.c')
-rw-r--r--drivers/md/dm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index c99e4728ff41..d23fda178163 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -21,6 +21,7 @@
21#include <linux/idr.h> 21#include <linux/idr.h>
22#include <linux/hdreg.h> 22#include <linux/hdreg.h>
23#include <linux/blktrace_api.h> 23#include <linux/blktrace_api.h>
24#include <trace/block.h>
24 25
25#define DM_MSG_PREFIX "core" 26#define DM_MSG_PREFIX "core"
26 27
@@ -504,8 +505,7 @@ static void dec_pending(struct dm_io *io, int error)
504 end_io_acct(io); 505 end_io_acct(io);
505 506
506 if (io->error != DM_ENDIO_REQUEUE) { 507 if (io->error != DM_ENDIO_REQUEUE) {
507 blk_add_trace_bio(io->md->queue, io->bio, 508 trace_block_bio_complete(io->md->queue, io->bio);
508 BLK_TA_COMPLETE);
509 509
510 bio_endio(io->bio, io->error); 510 bio_endio(io->bio, io->error);
511 } 511 }
@@ -598,7 +598,7 @@ static void __map_bio(struct dm_target *ti, struct bio *clone,
598 if (r == DM_MAPIO_REMAPPED) { 598 if (r == DM_MAPIO_REMAPPED) {
599 /* the bio has been remapped so dispatch it */ 599 /* the bio has been remapped so dispatch it */
600 600
601 blk_add_trace_remap(bdev_get_queue(clone->bi_bdev), clone, 601 trace_block_remap(bdev_get_queue(clone->bi_bdev), clone,
602 tio->io->bio->bi_bdev->bd_dev, 602 tio->io->bio->bi_bdev->bd_dev,
603 clone->bi_sector, sector); 603 clone->bi_sector, sector);
604 604