X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Fjbd2.h;h=6c1e0d7aed47f68c78bb8717bff2737f2cf4b8d2;hb=033520bec36ca3d3d46737141600dfed73760ab5;hp=8ead71ae30ead38ccd4d2d829af9f07aaa0e6be7;hpb=5f4c791e2ad2c814101ccdb500e65543f2792c41;p=lttng-modules.git

diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h
index 8ead71ae..6c1e0d7a 100644
--- a/include/instrumentation/events/jbd2.h
+++ b/include/instrumentation/events/jbd2.h
@@ -137,12 +137,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats,
 	)
 )
 
-#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,
-#endif
-
 	TP_PROTO(journal_t *journal, tid_t first_tid,
 		 unsigned long block_nr, unsigned long freed),
 
@@ -157,7 +152,46 @@ LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail,
 	)
 )
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_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
+	)
+)
+#else
 LTTNG_TRACEPOINT_EVENT(jbd2_write_superblock,
 
 	TP_PROTO(journal_t *journal, int write_op),