Sync `show_inode_state()` macro with upstream stable kernels

The following commit was backported to multiple stable branches:

  commit 5fcd57505c002efc5823a7355e21f48dd02d5a51
  Author: Jan Kara <jack@suse.cz>
  Date:   Fri May 29 16:24:43 2020 +0200

    writeback: Drop I_DIRTY_TIME_EXPIRE

    The only use of I_DIRTY_TIME_EXPIRE is to detect in
    __writeback_single_inode() that inode got there because flush worker
    decided it's time to writeback the dirty inode time stamps (either
    because we are syncing or because of age). However we can detect this
    directly in __writeback_single_inode() and there's no need for the
    strange propagation with I_DIRTY_TIME_EXPIRE flag.

Change-Id: I6e7c0ced13acd4fcd88bcd572d0ba1f9b254c58c
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/instrumentation/events/writeback.h b/include/instrumentation/events/writeback.h
index a29016a8ee8058927f642b5e1864a214438e9a56..99aafde4b0d5d8c4100a354ed17bd38442da1e50 100644 (file)
--- a/include/instrumentation/events/writeback.h
+++ b/include/instrumentation/events/writeback.h
@@ -72,7 +72,9 @@ static inline struct backing_dev_info *lttng_inode_to_bdi(struct inode *inode)
  * 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_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))
 #define show_inode_state(state)                                        \
        __print_flags(state, "|",                               \