File fix-btrfs-tracepoints-constify-all-pointers-v5.5.patch of Package lttng-modules.18435
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue Dec 10 11:41:12 2019 -0500
Subject: fix: btrfs: tracepoints: constify all pointers (v5.5)
Git-commit: 57ff707eaa42c6bfeb9998d17488bd604c069cc0
Signed-off-by: Tony Jones <tonyj@suse.de>
fix: btrfs: tracepoints: constify all pointers (v5.5)
See upstream commit:
commit 1d2e7c7c3ed73cc510a4dc093df2a935092ff5ad
Author: David Sterba <dsterba@suse.com>
Date: Thu Oct 17 13:28:57 2019 +0200
btrfs: tracepoints: constify all pointers
We don't modify the data passed to tracepoints, some of the declarations
are already const, add it to the rest.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h
index f3bb031..fbedd6c 100644
--- a/instrumentation/events/lttng-module/btrfs.h
+++ b/instrumentation/events/lttng-module/btrfs.h
@@ -289,7 +289,26 @@ LTTNG_TRACEPOINT_EVENT(btrfs_get_extent,
#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0))
+LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
+
+ TP_PROTO(const struct btrfs_fs_info *fs_info,
+ const struct extent_map *existing, const struct extent_map *map,
+ u64 start, u64 len),
+
+ TP_ARGS(fs_info, existing, map, start, len),
+
+ TP_FIELDS(
+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
+ ctf_integer(u64, e_start, existing->start)
+ ctf_integer(u64, e_len, existing->len)
+ ctf_integer(u64, map_start, map->start)
+ ctf_integer(u64, map_len, map->len)
+ ctf_integer(u64, start, start)
+ ctf_integer(u64, len, len)
+ )
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,18,0))
LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist,
TP_PROTO(struct btrfs_fs_info *fs_info,
@@ -1244,7 +1263,23 @@ LTTNG_TRACEPOINT_EVENT(btrfs_cow_block,
)
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0))
+LTTNG_TRACEPOINT_EVENT(btrfs_space_reservation,
+
+ TP_PROTO(const struct btrfs_fs_info *fs_info, const char *type, u64 val,
+ u64 bytes, int reserve),
+
+ TP_ARGS(fs_info, type, val, bytes, reserve),
+
+ TP_FIELDS(
+ ctf_array(u8, fsid, lttng_fs_info_fsid, BTRFS_UUID_SIZE)
+ ctf_string(type, type)
+ ctf_integer(u64, val, val)
+ ctf_integer(u64, bytes, bytes)
+ ctf_integer(int, reserve, reserve)
+ )
+)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \
LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \