From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
To: Michael Jeanson <mjeanson@efficios.com>
Cc: lttng-dev <lttng-dev@lists.lttng.org>
Subject: Re: [PATCH lttng-modules stable-2.10] fix: missing 'lttng_fs_info_fsid' wrapper in btrfs backport
Date: Wed, 11 Dec 2019 16:00:13 -0500 (EST) [thread overview]
Message-ID: <1339411647.2911.1576098013169.JavaMail.zimbra__29396.6340411984$1576098036$gmane$org@efficios.com> (raw)
In-Reply-To: <20191211202917.28820-1-mjeanson@efficios.com>
Merged, thanks!
Mathieu
----- On Dec 11, 2019, at 3:29 PM, Michael Jeanson mjeanson@efficios.com wrote:
> 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 <mjeanson@efficios.com>
> 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 <dsterba@suse.com>
> 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 <mjeanson@efficios.com>
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
>
> Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
> ---
> 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
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
next parent reply other threads:[~2019-12-11 21:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20191211202917.28820-1-mjeanson@efficios.com>
2019-12-11 21:00 ` Mathieu Desnoyers [this message]
2019-12-11 20:29 [PATCH lttng-modules stable-2.10] fix: missing 'lttng_fs_info_fsid' wrapper in btrfs backport Michael Jeanson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='1339411647.2911.1576098013169.JavaMail.zimbra__29396.6340411984$1576098036$gmane$org@efficios.com' \
--to=mathieu.desnoyers@efficios.com \
--cc=lttng-dev@lists.lttng.org \
--cc=mjeanson@efficios.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.