X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Fjbd.h;h=72c7af6afd883388c5be2354c4cdc244d3a16f98;hb=1158b2706e58c2f94e6bd746e0504b989320c0a1;hp=e9aabd692cdbcc85d95f10fd3bbc6e9eaed56d8d;hpb=4f47ccf08dfac3d5db7553eb8b40bdab19764727;p=lttng-modules.git

diff --git a/include/instrumentation/events/jbd.h b/include/instrumentation/events/jbd.h
index e9aabd69..72c7af6a 100644
--- a/include/instrumentation/events/jbd.h
+++ b/include/instrumentation/events/jbd.h
@@ -7,7 +7,7 @@
 
 #include <lttng/tracepoint-event.h>
 #include <linux/jbd.h>
-#include <linux/version.h>
+#include <lttng/kernel-version.h>
 
 LTTNG_TRACEPOINT_EVENT(jbd_checkpoint,
 
@@ -29,9 +29,6 @@ LTTNG_TRACEPOINT_EVENT_CLASS(jbd_commit,
 
 	TP_FIELDS(
 		ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-		ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
-#endif
 		ctf_integer(int, transaction, commit_transaction->t_tid)
 	)
 )
@@ -72,9 +69,6 @@ LTTNG_TRACEPOINT_EVENT(jbd_drop_transaction,
 
 	TP_FIELDS(
 		ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-		ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
-#endif
 		ctf_integer(int, transaction, commit_transaction->t_tid)
 	)
 )
@@ -86,9 +80,6 @@ LTTNG_TRACEPOINT_EVENT(jbd_end_commit,
 
 	TP_FIELDS(
 		ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-		ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
-#endif
 		ctf_integer(int, transaction, commit_transaction->t_tid)
 		ctf_integer(int, head, journal->j_tail_sequence)
 	)
@@ -101,9 +92,6 @@ LTTNG_TRACEPOINT_EVENT(jbd_do_submit_data,
 
 	TP_FIELDS(
 		ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0))
-		ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
-#endif
 		ctf_integer(int, transaction, commit_transaction->t_tid)
 	)
 )
@@ -124,7 +112,6 @@ LTTNG_TRACEPOINT_EVENT(jbd_cleanup_journal_tail,
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
 LTTNG_TRACEPOINT_EVENT_MAP(journal_write_superblock,
 
 	jbd_journal_write_superblock,
@@ -138,18 +125,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(journal_write_superblock,
 		ctf_integer(int, write_op, write_op)
 	)
 )
-#else
-LTTNG_TRACEPOINT_EVENT(jbd_update_superblock_end,
-	TP_PROTO(journal_t *journal, int wait),
-
-	TP_ARGS(journal, wait),
-
-	TP_FIELDS(
-		ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
-		ctf_integer(int, wait, wait)
-	)
-)
-#endif
 
 #endif /* LTTNG_TRACE_JBD_H */