blktrace: port to tracepoints, update
[linux-3.10.git] / include / trace / block.h
index 3cc2675..25c6a1f 100644 (file)
@@ -4,57 +4,73 @@
 #include <linux/blkdev.h>
 #include <linux/tracepoint.h>
 
-DEFINE_TRACE(block_rq_abort,
+DECLARE_TRACE(block_rq_abort,
        TPPROTO(struct request_queue *q, struct request *rq),
-       TPARGS(q, rq));
-DEFINE_TRACE(block_rq_insert,
+               TPARGS(q, rq));
+
+DECLARE_TRACE(block_rq_insert,
        TPPROTO(struct request_queue *q, struct request *rq),
-       TPARGS(q, rq));
-DEFINE_TRACE(block_rq_issue,
+               TPARGS(q, rq));
+
+DECLARE_TRACE(block_rq_issue,
        TPPROTO(struct request_queue *q, struct request *rq),
-       TPARGS(q, rq));
-DEFINE_TRACE(block_rq_requeue,
+               TPARGS(q, rq));
+
+DECLARE_TRACE(block_rq_requeue,
        TPPROTO(struct request_queue *q, struct request *rq),
-       TPARGS(q, rq));
-DEFINE_TRACE(block_rq_complete,
+               TPARGS(q, rq));
+
+DECLARE_TRACE(block_rq_complete,
        TPPROTO(struct request_queue *q, struct request *rq),
-       TPARGS(q, rq));
-DEFINE_TRACE(block_bio_bounce,
+               TPARGS(q, rq));
+
+DECLARE_TRACE(block_bio_bounce,
        TPPROTO(struct request_queue *q, struct bio *bio),
-       TPARGS(q, bio));
-DEFINE_TRACE(block_bio_complete,
+               TPARGS(q, bio));
+
+DECLARE_TRACE(block_bio_complete,
        TPPROTO(struct request_queue *q, struct bio *bio),
-       TPARGS(q, bio));
-DEFINE_TRACE(block_bio_backmerge,
+               TPARGS(q, bio));
+
+DECLARE_TRACE(block_bio_backmerge,
        TPPROTO(struct request_queue *q, struct bio *bio),
-       TPARGS(q, bio));
-DEFINE_TRACE(block_bio_frontmerge,
+               TPARGS(q, bio));
+
+DECLARE_TRACE(block_bio_frontmerge,
        TPPROTO(struct request_queue *q, struct bio *bio),
-       TPARGS(q, bio));
-DEFINE_TRACE(block_bio_queue,
+               TPARGS(q, bio));
+
+DECLARE_TRACE(block_bio_queue,
        TPPROTO(struct request_queue *q, struct bio *bio),
-       TPARGS(q, bio));
-DEFINE_TRACE(block_getrq,
+               TPARGS(q, bio));
+
+DECLARE_TRACE(block_getrq,
        TPPROTO(struct request_queue *q, struct bio *bio, int rw),
-       TPARGS(q, bio, rw));
-DEFINE_TRACE(block_sleeprq,
+               TPARGS(q, bio, rw));
+
+DECLARE_TRACE(block_sleeprq,
        TPPROTO(struct request_queue *q, struct bio *bio, int rw),
-       TPARGS(q, bio, rw));
-DEFINE_TRACE(block_plug,
+               TPARGS(q, bio, rw));
+
+DECLARE_TRACE(block_plug,
        TPPROTO(struct request_queue *q),
-       TPARGS(q));
-DEFINE_TRACE(block_unplug_timer,
+               TPARGS(q));
+
+DECLARE_TRACE(block_unplug_timer,
        TPPROTO(struct request_queue *q),
-       TPARGS(q));
-DEFINE_TRACE(block_unplug_io,
+               TPARGS(q));
+
+DECLARE_TRACE(block_unplug_io,
        TPPROTO(struct request_queue *q),
-       TPARGS(q));
-DEFINE_TRACE(block_split,
+               TPARGS(q));
+
+DECLARE_TRACE(block_split,
        TPPROTO(struct request_queue *q, struct bio *bio, unsigned int pdu),
-       TPARGS(q, bio, pdu));
-DEFINE_TRACE(block_remap,
+               TPARGS(q, bio, pdu));
+
+DECLARE_TRACE(block_remap,
        TPPROTO(struct request_queue *q, struct bio *bio, dev_t dev,
                sector_t from, sector_t to),
-       TPARGS(q, bio, dev, from, to));
+               TPARGS(q, bio, dev, from, to));
 
 #endif