From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@efficios.com (Mathieu Desnoyers)
Date: Mon, 30 Sep 2019 15:35:00 -0400 (EDT)
Subject: [lttng-dev] [PATCH lttng-modules] fix: btrfs: move basic
 block_group definitions to their own header (v5.4)
In-Reply-To: <20190930191534.11561-1-mjeanson@efficios.com>
References: <20190930191534.11561-1-mjeanson@efficios.com>
Message-ID: <459581456.4149.1569872100887.JavaMail.zimbra@efficios.com>

Merged into master, 2.11, 2.10, 2.9, thanks!

Mathieu

----- On Sep 30, 2019, at 3:15 PM, Michael Jeanson mjeanson at efficios.com wrote:

> commit aac0023c2106952538414254960c51dcf0dc39e9
>  Author: Josef Bacik <josef at toxicpanda.com>
>  Date:   Thu Jun 20 15:37:44 2019 -0400
> 
>    btrfs: move basic block_group definitions to their own header
> 
>    This is prep work for moving all of the block group cache code into its
>    own file.
> 
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> probes/lttng-probe-btrfs.c | 4 ++++
> 1 file changed, 4 insertions(+)
> 
> diff --git a/probes/lttng-probe-btrfs.c b/probes/lttng-probe-btrfs.c
> index b531197..69e69aa 100644
> --- a/probes/lttng-probe-btrfs.c
> +++ b/probes/lttng-probe-btrfs.c
> @@ -10,9 +10,13 @@
> 
> #include <linux/module.h>
> #include <linux/fs.h>
> +#include <linux/version.h>
> #include <../fs/btrfs/ctree.h>
> #include <../fs/btrfs/transaction.h>
> #include <../fs/btrfs/volumes.h>
> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0))
> +#include <../fs/btrfs/block-group.h>
> +#endif
> #include <linux/dcache.h>
> #include <lttng-tracer.h>
> 
> --
> 2.17.1

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com