X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=include%2Finstrumentation%2Fevents%2Fjbd2.h;h=a356a80cefeb71cdb3a122d1741eacd7c6c85ea6;hb=6687229729b31254fa5774f39ee2d768618b3172;hp=04968735c692db2d5a8ce414222a09ae3c8298a9;hpb=4f47ccf08dfac3d5db7553eb8b40bdab19764727;p=lttng-modules.git

diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h
index 04968735..a356a80c 100644
--- a/include/instrumentation/events/jbd2.h
+++ b/include/instrumentation/events/jbd2.h
@@ -7,7 +7,7 @@
 
 #include <lttng/tracepoint-event.h>
 #include <linux/jbd2.h>
-#include <linux/version.h>
+#include <lttng/kernel-version.h>
 
 #ifndef _TRACE_JBD2_DEF
 #define _TRACE_JBD2_DEF
@@ -68,7 +68,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_commit_logging,
 	TP_ARGS(journal, commit_transaction)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
 LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction,
 
 	TP_PROTO(journal_t *journal, transaction_t *commit_transaction),
@@ -137,7 +137,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats,
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
 LTTNG_TRACEPOINT_EVENT(jbd2_update_log_tail,
 #else
 LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail,
@@ -157,7 +157,46 @@ LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail,
 	)
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,0))
+
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
+LTTNG_TRACEPOINT_ENUM(req_op,
+	TP_ENUM_VALUES(
+		ctf_enum_value("REQ_OP_READ",		REQ_OP_READ)
+		ctf_enum_value("REQ_OP_WRITE",		REQ_OP_WRITE)
+		ctf_enum_value("REQ_OP_FLUSH",		REQ_OP_FLUSH)
+		ctf_enum_value("REQ_OP_DISCARD",	REQ_OP_DISCARD)
+		ctf_enum_value("REQ_OP_SECURE_ERASE",	REQ_OP_SECURE_ERASE)
+		ctf_enum_value("REQ_OP_WRITE_ZEROES",	REQ_OP_WRITE_ZEROES)
+		ctf_enum_value("REQ_OP_ZONE_OPEN",	REQ_OP_ZONE_OPEN)
+		ctf_enum_value("REQ_OP_ZONE_CLOSE",	REQ_OP_ZONE_CLOSE)
+		ctf_enum_value("REQ_OP_ZONE_FINISH",	REQ_OP_ZONE_FINISH)
+		ctf_enum_value("REQ_OP_ZONE_APPEND",	REQ_OP_ZONE_APPEND)
+		ctf_enum_value("REQ_OP_ZONE_RESET",	REQ_OP_ZONE_RESET)
+		ctf_enum_value("REQ_OP_ZONE_RESET_ALL",	REQ_OP_ZONE_RESET_ALL)
+		ctf_enum_value("REQ_OP_DRV_IN",		REQ_OP_DRV_IN)
+		ctf_enum_value("REQ_OP_DRV_OUT",	REQ_OP_DRV_OUT)
+		ctf_enum_value("REQ_OP_LAST",		REQ_OP_LAST)
+	)
+)
+#endif /* CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM */
+
+LTTNG_TRACEPOINT_EVENT(jbd2_write_superblock,
+
+	TP_PROTO(journal_t *journal, blk_opf_t write_flags),
+
+	TP_ARGS(journal, write_flags),
+
+	TP_FIELDS(
+		ctf_integer(dev_t, dev, journal->j_fs_dev->bd_dev)
+#ifdef CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM
+		ctf_enum(req_op, blk_opf_t, write_flags, write_flags)
+#else
+		ctf_integer_hex(blk_opf_t, write_flags, write_flags)
+#endif
+	)
+)
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,4,0))
 LTTNG_TRACEPOINT_EVENT(jbd2_write_superblock,
 
 	TP_PROTO(journal_t *journal, int write_op),