From 620971f9806e90c0805f766e0e56e95bffa20613 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 11 Dec 2019 15:29:17 -0500 Subject: [PATCH] fix: missing 'lttng_fs_info_fsid' wrapper in btrfs backport The following backported patch was missing the use of the 'lttng_fs_info_fsid' wrapper to enable compatibility with upstream stable kernels. commit 065436fd07d58a9a17427ad386ffcc8d29e25a9d Author: Michael Jeanson Date: Mon Jun 18 14:53:18 2018 -0400 Fix: btrfs: use fs_info for btrfs_handle_em_exist tracepoint See upstream commit: commit f46b24c9457143a367c6707eac82d546e2bcf280 Author: David Sterba Date: Tue Apr 3 21:45:57 2018 +0200 btrfs: use fs_info for btrfs_handle_em_exist tracepoint We really want to know to which filesystem the extent map events belong, but as it cannot be reached from the extent_map pointers, we need to pass it down the callchain. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- instrumentation/events/lttng-module/btrfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/events/lttng-module/btrfs.h b/instrumentation/events/lttng-module/btrfs.h index fbedd6cf..c8c494af 100644 --- a/instrumentation/events/lttng-module/btrfs.h +++ b/instrumentation/events/lttng-module/btrfs.h @@ -318,7 +318,7 @@ LTTNG_TRACEPOINT_EVENT(btrfs_handle_em_exist, TP_ARGS(fs_info, existing, map, start, len), TP_FIELDS( - ctf_array(u8, fsid, fs_info->fsid, BTRFS_UUID_SIZE) + 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) -- 2.34.1