Update kernel probes to more detailed match to kernel versions

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

diff --git a/instrumentation/events/lttng-module/ext3.h b/instrumentation/events/lttng-module/ext3.h
index de80df952734c44487a985aab2f9dcd7d4697a27..32917fbeb12b2fbe188a8e4afe02180bd1d3f2e9 100644 (file)
--- a/instrumentation/events/lttng-module/ext3.h
+++ b/instrumentation/events/lttng-module/ext3.h
@@ -5,12 +5,7 @@
 #define _TRACE_EXT3_H
 
 #include <linux/tracepoint.h>
-
-#ifndef _TRACE_EXT3_DEF
-#define _TRACE_EXT3_DEF
-static struct dentry *dentry;
-#endif
-
+#include <linux/version.h>
 
 TRACE_EVENT(ext3_free_inode,
        TP_PROTO(struct inode *inode),
@@ -30,8 +25,13 @@ TRACE_EVENT(ext3_free_inode,
                tp_assign(dev, inode->i_sb->s_dev)
                tp_assign(ino, inode->i_ino)
                tp_assign(mode, inode->i_mode)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+               tp_assign(uid, i_uid_read(inode))
+               tp_assign(gid, i_gid_read(inode))
+#else
                tp_assign(uid, inode->i_uid)
                tp_assign(gid, inode->i_gid)
+#endif
                tp_assign(blocks, inode->i_blocks)
        ),
 
@@ -441,12 +441,10 @@ TRACE_EVENT(ext3_sync_file_enter,
        ),
 
        TP_fast_assign(
-               dentry = file->f_path.dentry;
-
-               tp_assign(dev, dentry->d_inode->i_sb->s_dev)
-               tp_assign(ino, dentry->d_inode->i_ino)
+               tp_assign(dev, file->f_path.dentry->d_inode->i_sb->s_dev)
+               tp_assign(ino, file->f_path.dentry->d_inode->i_ino)
                tp_assign(datasync, datasync)
-               tp_assign(parent, dentry->d_parent->d_inode->i_ino)
+               tp_assign(parent, file->f_path.dentry->d_parent->d_inode->i_ino)
        ),
 
        TP_printk("dev %d,%d ino %lu parent %ld datasync %d ",