From: Michael Jeanson Date: Fri, 4 Sep 2020 15:52:51 +0000 (-0400) Subject: fix: version ranges for ext4_discard_preallocations and writeback_queue_io X-Git-Tag: v2.11.6~10 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=f60ce55b1b89a9e96b698e2dbb2aa52c945870db;p=lttng-modules.git fix: version ranges for ext4_discard_preallocations and writeback_queue_io Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: Id4fa53cb2e713cbda651e1a75deed91013115592 --- diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h index 064419e9..f9a55e29 100644 --- a/instrumentation/events/lttng-module/ext4.h +++ b/instrumentation/events/lttng-module/ext4.h @@ -547,7 +547,8 @@ LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa, ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0) || \ + LTTNG_KERNEL_RANGE(5,8,6, 5,9,0)) LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations, TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed), diff --git a/instrumentation/events/lttng-module/writeback.h b/instrumentation/events/lttng-module/writeback.h index 4aacbb9a..5bb94487 100644 --- a/instrumentation/events/lttng-module/writeback.h +++ b/instrumentation/events/lttng-module/writeback.h @@ -386,7 +386,13 @@ LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_balance_dirty_wait, writeback_wbc_balanc #endif LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writepage, writeback_wbc_writepage) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0) || \ + LTTNG_KERNEL_RANGE(5,8,6, 5,9,0) || \ + LTTNG_KERNEL_RANGE(5,4,62, 5,5,0) || \ + LTTNG_KERNEL_RANGE(4,19,143, 4,20,0) || \ + 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_TRACEPOINT_EVENT(writeback_queue_io, TP_PROTO(struct bdi_writeback *wb, struct wb_writeback_work *work,