]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob
5273efe53ede99c766105cf1275e0b58894310ab
[thirdparty/openembedded/openembedded-core-contrib.git] /
1 From aef97cb8d8ce45a9ea02eaedd20c28e4b69f4acf Mon Sep 17 00:00:00 2001
2 From: Kienan Stewart <kstewart@efficios.com>
3 Date: Mon, 29 Jul 2024 14:11:36 +0000
4 Subject: [PATCH 3/6] Fix: orig_start removed from btrfs_get_extent in 6.11-rc1
5
6 See upstream commit:
7
8 commit 4aa7b5d1784f510c0f42afc1d74efb41947221d7
9 Author: Qu Wenruo <wqu@suse.com>
10 Date: Tue Apr 30 07:53:04 2024 +0930
11
12 btrfs: remove extent_map::orig_start member
13
14 Since we have extent_map::offset, the old extent_map::orig_start is just
15 extent_map::start - extent_map::offset for non-hole/inline extents.
16
17 And since the new extent_map::offset is already verified by
18 validate_extent_map() while the old orig_start is not, let's just remove
19 the old member from all call sites.
20
21 Upstream-Status: Backport
22
23 Change-Id: I025a30d49b3e3ddc37d7846acc191ebbdf2ff19e
24 Signed-off-by: Kienan Stewart <kstewart@efficios.com>
25 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
26 ---
27 include/instrumentation/events/btrfs.h | 24 +++++++++++++++++++++++-
28 1 file changed, 23 insertions(+), 1 deletion(-)
29
30 diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h
31 index f1b82db4..40139dee 100644
32 --- a/include/instrumentation/events/btrfs.h
33 +++ b/include/instrumentation/events/btrfs.h
34 @@ -176,7 +176,29 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(btrfs__inode, btrfs_inode_evict,
35 )
36 #endif
37
38 -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
39 +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,11,0))
40 +
41 +LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
42 +
43 + TP_PROTO(const struct btrfs_root *root, const struct btrfs_inode *inode,
44 + const struct extent_map *map),
45 +
46 + TP_ARGS(root, inode, map),
47 +
48 + TP_FIELDS(
49 + ctf_integer(u64, root_objectid, root->root_key.objectid)
50 + ctf_integer(u64, ino, btrfs_ino(inode))
51 + ctf_integer(u64, start, map->start)
52 + ctf_integer(u64, len, map->len)
53 + ctf_integer(u64, block_start, map->block_start)
54 + ctf_integer(u64, block_len, map->block_len)
55 + ctf_integer(unsigned int, flags, map->flags)
56 + ctf_integer(int, refs, refcount_read(&map->refs))
57 + ctf_integer(unsigned int, compress_type, extent_map_compression(map))
58 + )
59 +)
60 +
61 +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0))
62
63 LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
64
65 --
66 2.39.2
67