Fix: update block instrumentation for kernel 4.12

[lttng-modules.git] / instrumentation / events / lttng-module / ext4.h

diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h
index 0a17becefb84f9304ef2eef533d07d0daf176cdb..e87b5340942de2390126dc03ebcd94ac09595755 100644 (file)
--- a/instrumentation/events/lttng-module/ext4.h
+++ b/instrumentation/events/lttng-module/ext4.h
@@ -4,7 +4,7 @@
 #if !defined(LTTNG_TRACE_EXT4_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_EXT4_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/writeback.h>
 #include <linux/version.h>
 
@@ -863,6 +863,24 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
        )
 )
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0))
+LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
+       TP_PROTO(struct inode *inode),
+
+       TP_ARGS(inode),
+
+       TP_FIELDS(
+               ctf_integer(dev_t, dev, inode->i_sb->s_dev)
+               ctf_integer(ino_t, ino, inode->i_ino)
+               ctf_integer(__u64, i_blocks, inode->i_blocks)
+               ctf_integer(int, reserved_data_blocks,
+                               EXT4_I(inode)->i_reserved_data_blocks)
+               ctf_integer(int, reserved_meta_blocks,
+                               EXT4_I(inode)->i_reserved_meta_blocks)
+               ctf_integer(TP_MODE_T, mode, inode->i_mode)
+       )
+)
+#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
 LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
        TP_PROTO(struct inode *inode, int md_needed),
 
@@ -880,6 +898,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space,
                ctf_integer(TP_MODE_T, mode, inode->i_mode)
        )
 )
+#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */
 
 LTTNG_TRACEPOINT_EVENT(ext4_da_release_space,
        TP_PROTO(struct inode *inode, int freed_blocks),
@@ -1229,7 +1248,6 @@ LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit,
        TP_FIELDS(
                ctf_integer(dev_t, dev, inode->i_sb->s_dev)
                ctf_integer(ino_t, ino, inode->i_ino)
-               ctf_integer(unsigned int, flags, flags)
                ctf_integer(ext4_fsblk_t, pblk, map->m_pblk)
                ctf_integer(ext4_lblk_t, lblk, map->m_lblk)
                ctf_integer(unsigned int, len, map->m_len)
@@ -1824,4 +1842,4 @@ LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_exit,
 #endif /* LTTNG_TRACE_EXT4_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>