diff options
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0001-fix-block-remove-GENHD_FL_SUPPRESS_PARTITION_INFO-v5.patch')
-rw-r--r-- | meta/recipes-kernel/lttng/lttng-modules/0001-fix-block-remove-GENHD_FL_SUPPRESS_PARTITION_INFO-v5.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-block-remove-GENHD_FL_SUPPRESS_PARTITION_INFO-v5.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-block-remove-GENHD_FL_SUPPRESS_PARTITION_INFO-v5.patch deleted file mode 100644 index 61c56c84ce..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-block-remove-GENHD_FL_SUPPRESS_PARTITION_INFO-v5.patch +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | From a88ee460b93c67ca756bd91ee9a8660813f65bd8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Michael Jeanson <mjeanson@efficios.com> | ||
3 | Date: Sun, 23 Jan 2022 13:04:47 -0500 | ||
4 | Subject: [PATCH 1/7] fix: block: remove GENHD_FL_SUPPRESS_PARTITION_INFO | ||
5 | (v5.17) | ||
6 | |||
7 | See upstream commit : | ||
8 | |||
9 | commit 3b5149ac50970669ee0ddb9629ec77ffd5c0622d | ||
10 | Author: Christoph Hellwig <hch@lst.de> | ||
11 | Date: Mon Nov 22 14:06:21 2021 +0100 | ||
12 | |||
13 | block: remove GENHD_FL_SUPPRESS_PARTITION_INFO | ||
14 | |||
15 | This flag is not set directly anywhere and only inherited from | ||
16 | GENHD_FL_HIDDEN. Just check for GENHD_FL_HIDDEN instead. | ||
17 | |||
18 | Link: https://lore.kernel.org/r/20211122130625.1136848-11-hch@lst.de | ||
19 | |||
20 | |||
21 | Upstream-Status: Backport [lttng-modules commit a88ee460b93c67ca756bd91ee9a8660813f65bd8] | ||
22 | |||
23 | Change-Id: Ide92bdaaff7d16e96be23aaf00cebeaa601235b7 | ||
24 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> | ||
25 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | ||
26 | --- | ||
27 | include/wrapper/genhd.h | 6 ++++++ | ||
28 | src/lttng-statedump-impl.c | 2 +- | ||
29 | 2 files changed, 7 insertions(+), 1 deletion(-) | ||
30 | |||
31 | diff --git a/include/wrapper/genhd.h b/include/wrapper/genhd.h | ||
32 | index 68980388..3c6dbcbe 100644 | ||
33 | --- a/include/wrapper/genhd.h | ||
34 | +++ b/include/wrapper/genhd.h | ||
35 | @@ -14,6 +14,12 @@ | ||
36 | |||
37 | #include <linux/genhd.h> | ||
38 | |||
39 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) | ||
40 | +#define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN | ||
41 | +#else | ||
42 | +#define LTTNG_GENHD_FL_HIDDEN GENHD_FL_SUPPRESS_PARTITION_INFO | ||
43 | +#endif | ||
44 | + | ||
45 | #ifdef CONFIG_KALLSYMS_ALL | ||
46 | |||
47 | #include <linux/kallsyms.h> | ||
48 | diff --git a/src/lttng-statedump-impl.c b/src/lttng-statedump-impl.c | ||
49 | index c5fca89d..4d7b2921 100644 | ||
50 | --- a/src/lttng-statedump-impl.c | ||
51 | +++ b/src/lttng-statedump-impl.c | ||
52 | @@ -334,7 +334,7 @@ int lttng_enumerate_block_devices(struct lttng_kernel_session *session) | ||
53 | * suppressed | ||
54 | */ | ||
55 | if (get_capacity(disk) == 0 || | ||
56 | - (disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO)) | ||
57 | + (disk->flags & LTTNG_GENHD_FL_HIDDEN)) | ||
58 | continue; | ||
59 | |||
60 | ret = lttng_statedump_each_block_device(session, disk); | ||
61 | -- | ||
62 | 2.19.1 | ||
63 | |||