git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFS] Fix merge failures
[pandora-kernel.git]
/
drivers
/
md
/
dm.c
diff --git
a/drivers/md/dm.c
b/drivers/md/dm.c
index
c99e472
..
343094c
100644
(file)
--- a/
drivers/md/dm.c
+++ b/
drivers/md/dm.c
@@
-21,6
+21,7
@@
#include <linux/idr.h>
#include <linux/hdreg.h>
#include <linux/blktrace_api.h>
#include <linux/idr.h>
#include <linux/hdreg.h>
#include <linux/blktrace_api.h>
+#include <trace/block.h>
#define DM_MSG_PREFIX "core"
#define DM_MSG_PREFIX "core"
@@
-51,6
+52,8
@@
struct dm_target_io {
union map_info info;
};
union map_info info;
};
+DEFINE_TRACE(block_bio_complete);
+
union map_info *dm_get_mapinfo(struct bio *bio)
{
if (bio && bio->bi_private)
union map_info *dm_get_mapinfo(struct bio *bio)
{
if (bio && bio->bi_private)
@@
-504,8
+507,7
@@
static void dec_pending(struct dm_io *io, int error)
end_io_acct(io);
if (io->error != DM_ENDIO_REQUEUE) {
end_io_acct(io);
if (io->error != DM_ENDIO_REQUEUE) {
- blk_add_trace_bio(io->md->queue, io->bio,
- BLK_TA_COMPLETE);
+ trace_block_bio_complete(io->md->queue, io->bio);
bio_endio(io->bio, io->error);
}
bio_endio(io->bio, io->error);
}
@@
-598,7
+600,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 */
if (r == DM_MAPIO_REMAPPED) {
/* the bio has been remapped so dispatch it */
-
blk_add_trace
_remap(bdev_get_queue(clone->bi_bdev), clone,
+
trace_block
_remap(bdev_get_queue(clone->bi_bdev), clone,
tio->io->bio->bi_bdev->bd_dev,
clone->bi_sector, sector);
tio->io->bio->bi_bdev->bd_dev,
clone->bi_sector, sector);