projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: block instrumentation: NULL pointer dereference
[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 d42ebd4e4cff2fbc73f0b0741bd4916305441b36..16043a01294df83c88f96fd01534fc879abfce37 100644
(file)
--- a/
instrumentation/events/lttng-module/block.h
+++ b/
instrumentation/events/lttng-module/block.h
@@
-365,7
+365,7
@@
DECLARE_EVENT_CLASS(block_bio,
),
TP_fast_assign(
),
TP_fast_assign(
- tp_assign(dev, bio->bi_bdev
->bd_dev
)
+ tp_assign(dev, bio->bi_bdev
? bio->bi_bdev->bd_dev : 0
)
tp_assign(sector, bio->bi_sector)
tp_assign(nr_sector, bio->bi_size >> 9)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
tp_assign(sector, bio->bi_sector)
tp_assign(nr_sector, bio->bi_size >> 9)
blk_fill_rwbs(rwbs, bio->bi_rw, bio->bi_size)
@@
-389,9
+389,15
@@
DECLARE_EVENT_CLASS(block_bio,
*/
DEFINE_EVENT(block_bio, block_bio_backmerge,
*/
DEFINE_EVENT(block_bio, block_bio_backmerge,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+ TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
+
+ TP_ARGS(q, rq, bio)
+#else
TP_PROTO(struct request_queue *q, struct bio *bio),
TP_ARGS(q, bio)
TP_PROTO(struct request_queue *q, struct bio *bio),
TP_ARGS(q, bio)
+#endif
)
/**
)
/**
@@
-404,9
+410,15
@@
DEFINE_EVENT(block_bio, block_bio_backmerge,
*/
DEFINE_EVENT(block_bio, block_bio_frontmerge,
*/
DEFINE_EVENT(block_bio, block_bio_frontmerge,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+ TP_PROTO(struct request_queue *q, struct request *rq, struct bio *bio),
+
+ TP_ARGS(q, rq, bio)
+#else
TP_PROTO(struct request_queue *q, struct bio *bio),
TP_ARGS(q, bio)
TP_PROTO(struct request_queue *q, struct bio *bio),
TP_ARGS(q, bio)
+#endif
)
/**
)
/**
This page took
0.127681 seconds
and
4
git commands to generate.