summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch')
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch b/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch
deleted file mode 100644
index c9f48e2f2b..0000000000
--- a/meta/recipes-kernel/lttng/lttng-modules/0004-Fix-block_len-removed-frmo-btrfs_get_extent-in-6.11-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 974125ab11a7f0b4df5658cdac26dc5cf9fdbc87 Mon Sep 17 00:00:00 2001
2From: Kienan Stewart <kstewart@efficios.com>
3Date: Mon, 29 Jul 2024 14:12:47 +0000
4Subject: [PATCH] Fix: block_len removed frmo btrfs_get_extent in 6.11-rc1
5
6See upstream commit:
7
8 commit e28b851ed9b232c3b84cb8d0fedbdfa8ca881386
9 Author: Qu Wenruo <wqu@suse.com>
10 Date: Tue Apr 30 07:53:05 2024 +0930
11
12 btrfs: remove extent_map::block_len member
13
14 The extent_map::block_len is either extent_map::len (non-compressed
15 extent) or extent_map::disk_num_bytes (compressed extent).
16
17 Since we already have sanity checks to do the cross-checks between the
18 new and old members, we can drop the old extent_map::block_len now.
19
20 For most call sites, they can manually select extent_map::len or
21 extent_map::disk_num_bytes, since most if not all of them have checked
22 if the extent is compressed.
23
24Upstream-Status: Backport
25
26Change-Id: Ib03fc685b4e876bf4e53afdd28ca9826342a0e4e
27Signed-off-by: Kienan Stewart <kstewart@efficios.com>
28Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
29---
30 include/instrumentation/events/btrfs.h | 1 -
31 1 file changed, 1 deletion(-)
32
33diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
34index dfad19c..28320d8 100644
35--- a/include/instrumentation/events/btrfs.h
36+++ b/include/instrumentation/events/btrfs.h
37@@ -192,7 +192,6 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
38 ctf_integer(u64, start, map->start)
39 ctf_integer(u64, len, map->len)
40 ctf_integer(u64, block_start, map->block_start)
41- ctf_integer(u64, block_len, map->block_len)
42 ctf_integer(unsigned int, flags, map->flags)
43 ctf_integer(int, refs, refcount_read(&map->refs))
44 ctf_integer(unsigned int, compress_type, extent_map_compression(map))