[lttng-dev] [PATCH lttng-modules] Fix: writeback instrumentation for 4.2 kernels

[Michael Jeanson]

Bandwidth related fields were moved by this commit:

commit a88a341a73be4ef035ca26170c849f002797da27
Author: Tejun Heo <tj at kernel.org>
Date:   Fri, 22 May 2015 17:13:28 -0400

    writeback: move bandwidth related fields from backing_dev_info into
    bdi_writeback

Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
 instrumentation/events/lttng-module/writeback.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/instrumentation/events/lttng-module/writeback.h b/instrumentation/events/lttng-module/writeback.h
index 88b7aa4..b55d15e 100644
--- a/instrumentation/events/lttng-module/writeback.h
+++ b/instrumentation/events/lttng-module/writeback.h
@@ -363,13 +363,27 @@ LTTNG_TRACEPOINT_EVENT_MAP(bdi_dirty_ratelimit,
 
 	TP_FIELDS(
 		ctf_array_text(char, bdi, dev_name(bdi->dev), 32)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+		ctf_integer(unsigned long, write_bw, KBps(bdi->wb.write_bandwidth))
+		ctf_integer(unsigned long, avg_write_bw, KBps(bdi->wb.avg_write_bandwidth))
+#else
 		ctf_integer(unsigned long, write_bw, KBps(bdi->write_bandwidth))
 		ctf_integer(unsigned long, avg_write_bw, KBps(bdi->avg_write_bandwidth))
+#endif
 		ctf_integer(unsigned long, dirty_rate, KBps(dirty_rate))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+		ctf_integer(unsigned long, dirty_ratelimit, KBps(bdi->wb.dirty_ratelimit))
+#else
 		ctf_integer(unsigned long, dirty_ratelimit, KBps(bdi->dirty_ratelimit))
+#endif
 		ctf_integer(unsigned long, task_ratelimit, KBps(task_ratelimit))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+		ctf_integer(unsigned long, balanced_dirty_ratelimit,
+					KBps(bdi->wb.balanced_dirty_ratelimit))
+#else
 		ctf_integer(unsigned long, balanced_dirty_ratelimit,
 					KBps(bdi->balanced_dirty_ratelimit))
+#endif
 	)
 )
 
-- 
1.9.1