X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fext3.h;h=286a1dfe65aeda2743c39086cd097591d12ceb9f;hb=026e6902b22bf8e84b1b89059c23257ee5c916b0;hp=de80df952734c44487a985aab2f9dcd7d4697a27;hpb=d3ac4d63d21c643df5b09d9d7888eb0c4122379c;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/ext3.h b/instrumentation/events/lttng-module/ext3.h
index de80df95..286a1dfe 100644
--- 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)
 	),
 
@@ -295,6 +295,38 @@ DEFINE_EVENT(ext3__page_op, ext3_releasepage,
 	TP_ARGS(page)
 )
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
+
+TRACE_EVENT(ext3_invalidatepage,
+	TP_PROTO(struct page *page, unsigned int offset, unsigned int length),
+
+	TP_ARGS(page, offset, length),
+
+	TP_STRUCT__entry(
+		__field(	pgoff_t, index			)
+		__field(	unsigned int, offset		)
+		__field(	unsigned int, length		)
+		__field(	ino_t,	ino			)
+		__field(	dev_t,	dev			)
+
+	),
+
+	TP_fast_assign(
+		tp_assign(index, page->index)
+		tp_assign(offset, offset)
+		tp_assign(length, length)
+		tp_assign(ino, page->mapping->host->i_ino)
+		tp_assign(dev, page->mapping->host->i_sb->s_dev)
+	),
+
+	TP_printk("dev %d,%d ino %lu page_index %lu offset %u length %u",
+		  MAJOR(__entry->dev), MINOR(__entry->dev),
+		  (unsigned long) __entry->ino,
+		  __entry->index, __entry->offset, __entry->length)
+)
+
+#else
+
 TRACE_EVENT(ext3_invalidatepage,
 	TP_PROTO(struct page *page, unsigned long offset),
 
@@ -321,6 +353,8 @@ TRACE_EVENT(ext3_invalidatepage,
 		  __entry->index, __entry->offset)
 )
 
+#endif
+
 TRACE_EVENT(ext3_discard_blocks,
 	TP_PROTO(struct super_block *sb, unsigned long blk,
 			unsigned long count),
@@ -441,12 +475,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 ",