summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-03-18 11:32:01 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-22 23:17:27 +0000
commitfc363acc5be39897a130893d220cc3e93974b162 (patch)
tree5a8929cb42cb857178a0bc5d2483e7da77e7e360 /meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch
parent20dec1e5271942c2d0d3d10c5b63f9b0b79cc952 (diff)
downloadpoky-fc363acc5be39897a130893d220cc3e93974b162.tar.gz
lttng-modules: update to v2.13.9
Bumping lttng-modules to version v2.13.9-4-g12f43cab, which comprises the following commits: da1f5a26 Version 2.13.9 dc2d1294 fix: jbd2: use the correct print format (v5.4.229) d04c1211 fix: jbd2 upper bound for v5.10.163 4b8864fc fix: jbd2: use the correct print format (v5.10.163) 69d3aa79 fix: btrfs: move accessor helpers into accessors.h (v6.2) We drop our previously backported commits as well, since they are part of the release. (From OE-Core rev: 79d8e93adde07ff3a4a239d66649ee566a2437d6) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch
deleted file mode 100644
index 26ae605b31..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-btrfs-move-accessor-helpers-into-accessors.h-v6..patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 69d3aa79a641f539cfd5c11b46b2dd9b4df9b0f0 Mon Sep 17 00:00:00 2001
2From: Michael Jeanson <mjeanson@efficios.com>
3Date: Mon, 16 Jan 2023 15:01:51 -0500
4Subject: [PATCH] fix: btrfs: move accessor helpers into accessors.h (v6.2)
5
6See upstream commit :
7
8 commit 07e81dc94474eb62705c6f96d9ab1a5a797b8703
9 Author: Josef Bacik <josef@toxicpanda.com>
10 Date: Wed Oct 19 10:51:00 2022 -0400
11
12 btrfs: move accessor helpers into accessors.h
13
14 This is a large patch, but because they're all macros it's impossible to
15 split up. Simply copy all of the item accessors in ctree.h and paste
16 them in accessors.h, and then update any files to include the header so
17 everything compiles.
18
19Upstream-Status: Backport
20
21Change-Id: I1f0876dd8b7a8687f6802b60c3e3baabd017cc52
22Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
23Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
24---
25 include/instrumentation/events/btrfs.h | 4 ++++
26 1 file changed, 4 insertions(+)
27
28diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
29index 785f16ac..01157107 100644
30--- a/include/instrumentation/events/btrfs.h
31+++ b/include/instrumentation/events/btrfs.h
32@@ -9,6 +9,10 @@
33 #include <linux/writeback.h>
34 #include <lttng/kernel-version.h>
35
36+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0))
37+#include <../fs/btrfs/accessors.h>
38+#endif
39+
40 #ifndef _TRACE_BTRFS_DEF_
41 #define _TRACE_BTRFS_DEF_
42 struct btrfs_root;
43--
442.34.1
45