Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame^] | 1 | From b74b25f349e92d7b5bdc8684e406d6a889f13773 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Jeanson <mjeanson@efficios.com> |
| 3 | Date: Fri, 4 Sep 2020 11:52:51 -0400 |
| 4 | Subject: [PATCH 09/10] fix: version ranges for ext4_discard_preallocations and |
| 5 | writeback_queue_io |
| 6 | |
| 7 | Upstream-Status: Backport |
| 8 | |
| 9 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> |
| 10 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| 11 | Change-Id: Id4fa53cb2e713cbda651e1a75deed91013115592 |
| 12 | --- |
| 13 | instrumentation/events/lttng-module/ext4.h | 3 ++- |
| 14 | instrumentation/events/lttng-module/writeback.h | 8 +++++++- |
| 15 | 2 files changed, 9 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h |
| 18 | index 4476abb..b172c8d 100644 |
| 19 | --- a/instrumentation/events/lttng-module/ext4.h |
| 20 | +++ b/instrumentation/events/lttng-module/ext4.h |
| 21 | @@ -460,7 +460,8 @@ LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa, |
| 22 | ) |
| 23 | #endif |
| 24 | |
| 25 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)) |
| 26 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0) || \ |
| 27 | + LTTNG_KERNEL_RANGE(5,8,6, 5,9,0)) |
| 28 | LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations, |
| 29 | TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed), |
| 30 | |
| 31 | diff --git a/instrumentation/events/lttng-module/writeback.h b/instrumentation/events/lttng-module/writeback.h |
| 32 | index e9018dd..09637d7 100644 |
| 33 | --- a/instrumentation/events/lttng-module/writeback.h |
| 34 | +++ b/instrumentation/events/lttng-module/writeback.h |
| 35 | @@ -384,7 +384,13 @@ LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_balance_dirty_wait, writeback_wbc_balanc |
| 36 | #endif |
| 37 | LTTNG_TRACEPOINT_EVENT_WBC_INSTANCE(wbc_writepage, writeback_wbc_writepage) |
| 38 | |
| 39 | -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)) |
| 40 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0) || \ |
| 41 | + LTTNG_KERNEL_RANGE(5,8,6, 5,9,0) || \ |
| 42 | + LTTNG_KERNEL_RANGE(5,4,62, 5,5,0) || \ |
| 43 | + LTTNG_KERNEL_RANGE(4,19,143, 4,20,0) || \ |
| 44 | + LTTNG_KERNEL_RANGE(4,14,196, 4,15,0) || \ |
| 45 | + LTTNG_KERNEL_RANGE(4,9,235, 4,10,0) || \ |
| 46 | + LTTNG_KERNEL_RANGE(4,4,235, 4,5,0)) |
| 47 | LTTNG_TRACEPOINT_EVENT(writeback_queue_io, |
| 48 | TP_PROTO(struct bdi_writeback *wb, |
| 49 | struct wb_writeback_work *work, |
| 50 | -- |
| 51 | 2.19.1 |
| 52 | |