X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fjbd.h;h=0f45c82fd42ca184ecb0c35fe8280774a4e85ea6;hb=2d0428212cbfa3f8428feee160b095f48c2ac974;hp=335be5cb6e74888059e7e7d8efd965740498a3f7;hpb=f127e61ee231d002fb9a7803643a157e06f6d2e2;p=lttng-modules.git

diff --git a/instrumentation/events/lttng-module/jbd.h b/instrumentation/events/lttng-module/jbd.h
index 335be5cb..0f45c82f 100644
--- a/instrumentation/events/lttng-module/jbd.h
+++ b/instrumentation/events/lttng-module/jbd.h
@@ -1,12 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM jbd
 
 #if !defined(LTTNG_TRACE_JBD_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_JBD_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/jbd.h>
-#include <linux/version.h>
+#include <lttng-kernel-version.h>
 
 LTTNG_TRACEPOINT_EVENT(jbd_checkpoint,
 
@@ -28,7 +29,7 @@ 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))
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(3,5,0))
 		ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
 #endif
 		ctf_integer(int, transaction, commit_transaction->t_tid)
@@ -71,7 +72,7 @@ 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))
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(3,5,0))
 		ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
 #endif
 		ctf_integer(int, transaction, commit_transaction->t_tid)
@@ -85,7 +86,7 @@ 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))
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(3,5,0))
 		ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
 #endif
 		ctf_integer(int, transaction, commit_transaction->t_tid)
@@ -100,7 +101,7 @@ 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))
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(3,5,0))
 		ctf_integer(char, sync_commit, commit_transaction->t_synchronous_commit)
 #endif
 		ctf_integer(int, transaction, commit_transaction->t_tid)
@@ -123,7 +124,7 @@ LTTNG_TRACEPOINT_EVENT(jbd_cleanup_journal_tail,
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,5,0))
 LTTNG_TRACEPOINT_EVENT_MAP(journal_write_superblock,
 
 	jbd_journal_write_superblock,
@@ -146,20 +147,11 @@ LTTNG_TRACEPOINT_EVENT(jbd_update_superblock_end,
 	TP_FIELDS(
 		ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
 		ctf_integer(int, wait, wait)
-	),
-
-	TP_fast_assign(
-		tp_assign(dev, journal->j_fs_dev->bd_dev)
-		tp_assign(wait, wait)
-	),
-
-	TP_printk("dev %d,%d wait %d",
-		  MAJOR(__entry->dev), MINOR(__entry->dev),
-		   __entry->wait)
+	)
 )
 #endif
 
 #endif /* LTTNG_TRACE_JBD_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>