projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: update block instrumentation for SuSE 4.4.114-92
[lttng-modules.git]
/
instrumentation
/
events
/
lttng-module
/
block.h
diff --git
a/instrumentation/events/lttng-module/block.h
b/instrumentation/events/lttng-module/block.h
index c43d747110e21b908bdb17d26b9502daf75a0f36..910217bc26a54880578dc1535c47e1a402f694ae 100644
(file)
--- a/
instrumentation/events/lttng-module/block.h
+++ b/
instrumentation/events/lttng-module/block.h
@@
-33,7
+33,8
@@
enum {
#endif /* _TRACE_BLOCK_DEF_ */
#endif /* _TRACE_BLOCK_DEF_ */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,8,0) || \
+ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,114,92,0,0))
#define lttng_req_op(rq) req_op(rq)
#define lttng_req_rw(rq) ((rq)->cmd_flags)
#define lttng_req_op(rq) req_op(rq)
#define lttng_req_rw(rq) ((rq)->cmd_flags)
@@
-611,7
+612,11
@@
LTTNG_TRACEPOINT_EVENT(block_bio_bounce,
TP_ARGS(q, bio),
TP_FIELDS(
TP_ARGS(q, bio),
TP_FIELDS(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
+ ctf_integer(dev_t, dev, bio_dev(bio))
+#else
ctf_integer(dev_t, dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
ctf_integer(dev_t, dev, bio->bi_bdev ? bio->bi_bdev->bd_dev : 0)
+#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
@@
-652,7
+657,11
@@
LTTNG_TRACEPOINT_EVENT(block_bio_complete,
#endif
TP_FIELDS(
#endif
TP_FIELDS(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
+ ctf_integer(dev_t, dev, bio_dev(bio))
+#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
+#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
@@
-682,7
+691,11
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_bio_merge,
TP_ARGS(q, rq, bio),
TP_FIELDS(
TP_ARGS(q, rq, bio),
TP_FIELDS(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
+ ctf_integer(dev_t, dev, bio_dev(bio))
+#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
+#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
@@
-744,7
+757,11
@@
LTTNG_TRACEPOINT_EVENT(block_bio_queue,
TP_ARGS(q, bio),
TP_FIELDS(
TP_ARGS(q, bio),
TP_FIELDS(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
+ ctf_integer(dev_t, dev, bio_dev(bio))
+#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
+#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
@@
-831,7
+848,11
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq,
TP_ARGS(q, bio, rw),
TP_FIELDS(
TP_ARGS(q, bio, rw),
TP_FIELDS(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
+ ctf_integer(dev_t, dev, bio ? bio_dev(bio) : 0)
+#else
ctf_integer(dev_t, dev, bio ? bio->bi_bdev->bd_dev : 0)
ctf_integer(dev_t, dev, bio ? bio->bi_bdev->bd_dev : 0)
+#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio ? bio->bi_iter.bi_sector : 0)
ctf_integer(unsigned int, nr_sector,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio ? bio->bi_iter.bi_sector : 0)
ctf_integer(unsigned int, nr_sector,
@@
-857,7
+878,7
@@
LTTNG_TRACEPOINT_EVENT_CLASS(block_get_rq,
/**
* block_getrq - get a free request entry in queue for block IO operations
* @q: queue for operations
/**
* block_getrq - get a free request entry in queue for block IO operations
* @q: queue for operations
- * @bio: pending block IO operation
+ * @bio: pending block IO operation
(can be %NULL)
* @rw: low bit indicates a read (%0) or a write (%1)
*
* A request struct for queue @q has been allocated to handle the
* @rw: low bit indicates a read (%0) or a write (%1)
*
* A request struct for queue @q has been allocated to handle the
@@
-873,7
+894,7
@@
LTTNG_TRACEPOINT_EVENT_INSTANCE(block_get_rq, block_getrq,
/**
* block_sleeprq - waiting to get a free request entry in queue for block IO operation
* @q: queue for operation
/**
* block_sleeprq - waiting to get a free request entry in queue for block IO operation
* @q: queue for operation
- * @bio: pending block IO operation
+ * @bio: pending block IO operation
(can be %NULL)
* @rw: low bit indicates a read (%0) or a write (%1)
*
* In the case where a request struct cannot be provided for queue @q
* @rw: low bit indicates a read (%0) or a write (%1)
*
* In the case where a request struct cannot be provided for queue @q
@@
-992,7
+1013,11
@@
LTTNG_TRACEPOINT_EVENT(block_split,
TP_ARGS(q, bio, new_sector),
TP_FIELDS(
TP_ARGS(q, bio, new_sector),
TP_FIELDS(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
+ ctf_integer(dev_t, dev, bio_dev(bio))
+#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
+#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
blk_rwbs_ctf_integer(unsigned int, rwbs,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
blk_rwbs_ctf_integer(unsigned int, rwbs,
@@
-1031,7
+1056,11
@@
LTTNG_TRACEPOINT_EVENT(block_remap,
TP_ARGS(q, bio, dev, from),
TP_FIELDS(
TP_ARGS(q, bio, dev, from),
TP_FIELDS(
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
+ ctf_integer(dev_t, dev, bio_dev(bio))
+#else
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
ctf_integer(dev_t, dev, bio->bi_bdev->bd_dev)
+#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0))
ctf_integer(sector_t, sector, bio->bi_iter.bi_sector)
ctf_integer(unsigned int, nr_sector, bio_sectors(bio))
This page took
0.02848 seconds
and
4
git commands to generate.