From b6af46d166c48c9e59600a60b5a2a7ead10f179a Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 4 Sep 2020 11:52:51 -0400 Subject: [PATCH] fix: version ranges for ext4_discard_preallocations and writeback_queue_io Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: Id4fa53cb2e713cbda651e1a75deed91013115592 --- include/instrumentation/events/ext4.h | 3 ++- include/instrumentation/events/writeback.h | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h index 88ab394c..5a61962b 100644 --- a/include/instrumentation/events/ext4.h +++ b/include/instrumentation/events/ext4.h @@ -460,7 +460,8 @@ LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa, ) #endif -#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/include/instrumentation/events/writeback.h b/include/instrumentation/events/writeback.h index 44846533..273e4dc4 100644 --- a/include/instrumentation/events/writeback.h +++ b/include/instrumentation/events/writeback.h @@ -384,7 +384,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, -- 2.34.1