diff options
author | Yogesh Tyagi <yogesh.tyagi@intel.com> | 2024-03-20 11:38:18 +0530 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-20 18:20:38 +0000 |
commit | 160dce550c8a9496858d61c756bc889da8ccd6f2 (patch) | |
tree | 7e8cc1ef7f3c947881afc2785e890d30e4cb99fd /meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch | |
parent | 181f8d101bcc669cedd76524dc216d39d281c789 (diff) | |
download | poky-160dce550c8a9496858d61c756bc889da8ccd6f2.tar.gz |
lttng-modules: fix v6.8+ build
Backport a patch which remove 'needed' in trace_ext4_discard_preallocations
(From OE-Core rev: 88c78fec6daf34d4bf50f788a0adc75e601994da)
Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch b/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch new file mode 100644 index 0000000000..c35f5b61fa --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0006-Fix-ext4_discard_preallocations-changed-in-linux-6.8.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From c1e074414f087b6ecc229a9385a44eb3b3dfeaea Mon Sep 17 00:00:00 2001 | ||
2 | From: Kienan Stewart <kstewart@efficios.com> | ||
3 | Date: Mon, 5 Feb 2024 08:52:29 -0500 | ||
4 | Subject: [PATCH] Fix: ext4_discard_preallocations changed in linux 6.8.0-rc3 | ||
5 | |||
6 | See upstream commit: | ||
7 | |||
8 | commit f0e54b6087de9571ec61c189d6c378b81edbe3b2 | ||
9 | Author: Kemeng Shi <shikemeng@huaweicloud.com> | ||
10 | Date: Fri Jan 5 17:21:02 2024 +0800 | ||
11 | |||
12 | ext4: remove 'needed' in trace_ext4_discard_preallocations | ||
13 | |||
14 | As 'needed' to trace_ext4_discard_preallocations is always 0 which | ||
15 | is meaningless. Just remove it. | ||
16 | |||
17 | Change-Id: Ib6b698ca553c4beebd4ca791c83bbbb927901758 | ||
18 | Signed-off-by: Kienan Stewart <kstewart@efficios.com> | ||
19 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
20 | |||
21 | Upstream-Status: Backport [https://github.com/lttng/lttng-modules/commit/2da4de37de6382b4440737fdf4320e08a089afcd] | ||
22 | |||
23 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
24 | --- | ||
25 | include/instrumentation/events/ext4.h | 14 +++++++++++++- | ||
26 | 1 file changed, 13 insertions(+), 1 deletion(-) | ||
27 | |||
28 | diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h | ||
29 | index 222416e..05a6453 100644 | ||
30 | --- a/include/instrumentation/events/ext4.h | ||
31 | +++ b/include/instrumentation/events/ext4.h | ||
32 | @@ -490,7 +490,19 @@ LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa, | ||
33 | ) | ||
34 | #endif | ||
35 | |||
36 | -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \ | ||
37 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) | ||
38 | +LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations, | ||
39 | + TP_PROTO(struct inode *inode, unsigned int len), | ||
40 | + | ||
41 | + TP_ARGS(inode, len), | ||
42 | + | ||
43 | + TP_FIELDS( | ||
44 | + ctf_integer(dev_t, dev, inode->i_sb->s_dev) | ||
45 | + ctf_integer(ino_t, ino, inode->i_ino) | ||
46 | + ctf_integer(unsigned int, len, len) | ||
47 | + ) | ||
48 | +) | ||
49 | +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \ | ||
50 | LTTNG_KERNEL_RANGE(5,8,6, 5,9,0)) | ||
51 | LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations, | ||
52 | TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed), | ||