From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Jeanson Subject: [PATCH lttng-modules stable-2.10] fix: missing 'lttng_fs_info_fsid' wrapper in btrfs backport Date: Wed, 11 Dec 2019 15:29:17 -0500 Message-ID: <20191211202917.28820-1-mjeanson__36062.7395029709$1576096192$gmane$org@efficios.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.efficios.com (mail.efficios.com [167.114.142.138]) by lists.lttng.org (Postfix) with ESMTPS id 47Y7nl27kGz16Bt for ; Wed, 11 Dec 2019 15:29:30 -0500 (EST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lttng-dev-bounces@lists.lttng.org Sender: "lttng-dev" To: lttng-dev@lists.lttng.org List-Id: lttng-dev@lists.lttng.org 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 --- 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 fbedd6c..c8c494a 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.17.1