* Re: [PATCH lttng-modules] fix: btrfs: move basic block_group definitions to their own header (v5.4)
[not found] <20190930191534.11561-1-mjeanson@efficios.com>
@ 2019-09-30 19:35 ` Mathieu Desnoyers
0 siblings, 0 replies; 2+ messages in thread
From: Mathieu Desnoyers @ 2019-09-30 19:35 UTC (permalink / raw)
To: Michael Jeanson; +Cc: lttng-dev
Merged into master, 2.11, 2.10, 2.9, thanks!
Mathieu
----- On Sep 30, 2019, at 3:15 PM, Michael Jeanson mjeanson@efficios.com wrote:
> commit aac0023c2106952538414254960c51dcf0dc39e9
> Author: Josef Bacik <josef@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@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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH lttng-modules] fix: btrfs: move basic block_group definitions to their own header (v5.4)
@ 2019-09-30 19:15 Michael Jeanson
0 siblings, 0 replies; 2+ messages in thread
From: Michael Jeanson @ 2019-09-30 19:15 UTC (permalink / raw)
To: lttng-dev
commit aac0023c2106952538414254960c51dcf0dc39e9
Author: Josef Bacik <josef@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@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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-30 19:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20190930191534.11561-1-mjeanson@efficios.com>
2019-09-30 19:35 ` [PATCH lttng-modules] fix: btrfs: move basic block_group definitions to their own header (v5.4) Mathieu Desnoyers
2019-09-30 19:15 Michael Jeanson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).