X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Fwriteback.h;h=c4510b44b4ad579b74925e49494241623bca2842;hb=abbffdb8dfba2a3b8ba7f5b738b6c55debcf1a13;hp=f05708a8376c6f949665eae06b19c4087977cf75;hpb=dbabd7296e9bcfb263f96e78c185f1eb7346ee53;p=lttng-modules.git

diff --git a/include/instrumentation/events/writeback.h b/include/instrumentation/events/writeback.h
index f05708a8..c4510b44 100644
--- a/include/instrumentation/events/writeback.h
+++ b/include/instrumentation/events/writeback.h
@@ -65,7 +65,18 @@ static inline struct backing_dev_info *lttng_inode_to_bdi(struct inode *inode)
 
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0))
+/*
+ * Keep this macro around to track changes in the valid values for `state`.
+ * Eventually, we will have a enum to describe that field. If the macro is
+ * changed by an upstream kernel, the fact that we have a redefinition here
+ * will generate a compiler warning.
+ */
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \
+	LTTNG_KERNEL_RANGE(4,14,218, 4,15,0) ||			\
+	LTTNG_KERNEL_RANGE(4,19,172, 4,20,0) ||			\
+	LTTNG_KERNEL_RANGE(5,4,94, 5,5,0) ||			\
+	LTTNG_UBUNTU_KERNEL_RANGE(4,15,18,141, 4,16,0,0) ||	\
+	LTTNG_RHEL_KERNEL_RANGE(4,18,0,240,0,0, 4,19,0,0,0,0))
 #define show_inode_state(state)					\
 	__print_flags(state, "|",				\
 		{I_DIRTY_SYNC,		"I_DIRTY_SYNC"},	\
@@ -384,7 +395,8 @@ LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writepage, writeback_wbc_writepage)
 	LTTNG_KERNEL_RANGE(4,14,196, 4,15,0) || \
 	LTTNG_KERNEL_RANGE(4,9,235, 4,10,0) || \
 	LTTNG_KERNEL_RANGE(4,4,235, 4,5,0) || \
-	LTTNG_UBUNTU_KERNEL_RANGE(4,15,18,119, 4,16,0,0))
+	LTTNG_UBUNTU_KERNEL_RANGE(4,15,18,119, 4,16,0,0) || \
+	LTTNG_RHEL_KERNEL_RANGE(4,18,0,240,0,0, 4,19,0,0,0,0))
 LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
 	TP_PROTO(struct bdi_writeback *wb,
 		 struct wb_writeback_work *work,
@@ -427,7 +439,8 @@ LTTNG_TRACEPOINT_EVENT(writeback_queue_io,
 )
 #endif
 
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,8,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,8,0) || \
+	LTTNG_RHEL_KERNEL_RANGE(4,18,0,305,0,0, 4,19,0,0,0,0))
 LTTNG_TRACEPOINT_EVENT_MAP(global_dirty_state,
 
 	writeback_global_dirty_state,