| Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 1 | From 69d3aa79a641f539cfd5c11b46b2dd9b4df9b0f0 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michael Jeanson <mjeanson@efficios.com> |
| 3 | Date: Mon, 16 Jan 2023 15:01:51 -0500 |
| 4 | Subject: [PATCH] fix: btrfs: move accessor helpers into accessors.h (v6.2) |
| 5 | |
| 6 | See upstream commit : |
| 7 | |
| 8 | commit 07e81dc94474eb62705c6f96d9ab1a5a797b8703 |
| 9 | Author: Josef Bacik <josef@toxicpanda.com> |
| 10 | Date: Wed Oct 19 10:51:00 2022 -0400 |
| 11 | |
| 12 | btrfs: move accessor helpers into accessors.h |
| 13 | |
| 14 | This is a large patch, but because they're all macros it's impossible to |
| 15 | split up. Simply copy all of the item accessors in ctree.h and paste |
| 16 | them in accessors.h, and then update any files to include the header so |
| 17 | everything compiles. |
| 18 | |
| 19 | Upstream-Status: Backport |
| 20 | |
| 21 | Change-Id: I1f0876dd8b7a8687f6802b60c3e3baabd017cc52 |
| 22 | Signed-off-by: Michael Jeanson <mjeanson@efficios.com> |
| 23 | Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> |
| 24 | --- |
| 25 | include/instrumentation/events/btrfs.h | 4 ++++ |
| 26 | 1 file changed, 4 insertions(+) |
| 27 | |
| 28 | diff --git a/include/instrumentation/events/btrfs.h b/include/instrumentation/events/btrfs.h |
| 29 | index 785f16ac..01157107 100644 |
| 30 | --- a/include/instrumentation/events/btrfs.h |
| 31 | +++ b/include/instrumentation/events/btrfs.h |
| 32 | @@ -9,6 +9,10 @@ |
| 33 | #include <linux/writeback.h> |
| 34 | #include <lttng/kernel-version.h> |
| 35 | |
| 36 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0)) |
| 37 | +#include <../fs/btrfs/accessors.h> |
| 38 | +#endif |
| 39 | + |
| 40 | #ifndef _TRACE_BTRFS_DEF_ |
| 41 | #define _TRACE_BTRFS_DEF_ |
| 42 | struct btrfs_root; |
| 43 | -- |
| 44 | 2.34.1 |
| 45 | |