fix: adjust ranges for RHEL 8.4

[lttng-modules.git] / instrumentation / events / lttng-module / writeback.h

diff --git a/instrumentation/events/lttng-module/writeback.h b/instrumentation/events/lttng-module/writeback.h
index 6633e239aea8f9997e51897e86bacc81ee012c4e..7726c1e1f85f7404a8afb1da83479ff10c85beee 100644 (file)
--- a/instrumentation/events/lttng-module/writeback.h
+++ b/instrumentation/events/lttng-module/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,