From f26997df33d3b34e946d6c940b4d6bd4d3839e1e Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Mon, 10 May 2021 13:41:48 -0400 Subject: [PATCH] Sync `show_inode_state()` macro with Ubuntu 4.15 kernel The following commit changed the `show_inode_state()` macro which triggered a warning on our CI build: commit 63388062bea96e5cd8b8d7abf7b7142f8666ca1f Author: Jan Kara Date: Mon Jan 25 12:37:43 2021 -0800 writeback: Drop I_DIRTY_TIME_EXPIRE Also, this commit adds a comment to clarify why we keep these `#if/#elif` even though we don't use it the macro. Signed-off-by: Francis Deslauriers Signed-off-by: Mathieu Desnoyers Change-Id: I2dd53a1a286ab8a431977bda6cde01f700f0c7d9 --- include/instrumentation/events/writeback.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/instrumentation/events/writeback.h b/include/instrumentation/events/writeback.h index 32894517..a29016a8 100644 --- a/include/instrumentation/events/writeback.h +++ b/include/instrumentation/events/writeback.h @@ -65,8 +65,15 @@ static inline struct backing_dev_info *lttng_inode_to_bdi(struct inode *inode) #endif +/* + * 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_UBUNTU_KERNEL_RANGE(5,4,94,67, 5,5,0,0)) + LTTNG_UBUNTU_KERNEL_RANGE(5,4,94,67, 5,5,0,0) || \ + LTTNG_UBUNTU_KERNEL_RANGE(4,15,18,141, 4,16,0,0)) #define show_inode_state(state) \ __print_flags(state, "|", \ {I_DIRTY_SYNC, "I_DIRTY_SYNC"}, \ -- 2.34.1