X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fext4.h;h=b9f78f1a183c5c92703395d02917fb0a94eab9b1;hb=f1b58fb1b2302a3dd7b4563041b14ccdd12ee500;hp=41c89fd3bb65cc6c5887c04e76b0e06f0c9cac81;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h
index 41c89fd3..b9f78f1a 100644
--- a/instrumentation/events/lttng-module/ext4.h
+++ b/instrumentation/events/lttng-module/ext4.h
@@ -277,7 +277,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages,
 		ctf_integer(int, io_done, mpd->io_done)
 		ctf_integer(int, pages_written, mpd->pages_written)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
-		ctf_integer(int, sync_mode, mpd->sync_mode)
+		ctf_integer(int, sync_mode, mpd->wbc->sync_mode)
 #endif
 	)
 )
@@ -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)