From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH v2 10/12] btrfs: include trace header in where necessary
Date: Fri, 25 Aug 2023 16:19:28 -0400 [thread overview]
Message-ID: <59f02409baa3a41239ff61c3cf4c62b2a26501b9.1692994620.git.josef@toxicpanda.com> (raw)
In-Reply-To: <cover.1692994620.git.josef@toxicpanda.com>
If we no longer include the tracepoints from ctree.h we fail to compile
because we have the dependency in some of the header files and source
files. Add the include where we have these dependencies to allow us to
remove the include from ctree.h.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/async-thread.c | 1 +
fs/btrfs/btrfs_inode.h | 1 +
fs/btrfs/locking.c | 1 +
fs/btrfs/space-info.h | 1 +
4 files changed, 4 insertions(+)
diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c
index ce083e99ef68..714ca74b66bf 100644
--- a/fs/btrfs/async-thread.c
+++ b/fs/btrfs/async-thread.c
@@ -9,6 +9,7 @@
#include <linux/list.h>
#include <linux/spinlock.h>
#include <linux/freezer.h>
+#include <trace/events/btrfs.h>
#include "async-thread.h"
#include "ctree.h"
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index bca97a6bb246..b675dc09845d 100644
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -9,6 +9,7 @@
#include <linux/hash.h>
#include <linux/refcount.h>
#include <linux/fscrypt.h>
+#include <trace/events/btrfs.h>
#include "extent_map.h"
#include "extent_io.h"
#include "ordered-data.h"
diff --git a/fs/btrfs/locking.c b/fs/btrfs/locking.c
index 7979449a58d6..79a125c0f4a2 100644
--- a/fs/btrfs/locking.c
+++ b/fs/btrfs/locking.c
@@ -8,6 +8,7 @@
#include <linux/spinlock.h>
#include <linux/page-flags.h>
#include <asm/bug.h>
+#include <trace/events/btrfs.h>
#include "misc.h"
#include "ctree.h"
#include "extent_io.h"
diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
index 0bb9d14e60a8..ac0ce83f1477 100644
--- a/fs/btrfs/space-info.h
+++ b/fs/btrfs/space-info.h
@@ -3,6 +3,7 @@
#ifndef BTRFS_SPACE_INFO_H
#define BTRFS_SPACE_INFO_H
+#include <trace/events/btrfs.h>
#include "volumes.h"
/*
--
2.41.0
next prev parent reply other threads:[~2023-08-25 20:20 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-25 20:19 [PATCH v2 00/12] btrfs: ctree.[ch] cleanups Josef Bacik
2023-08-25 20:19 ` [PATCH v2 01/12] btrfs: move btrfs_crc32c_final into free-space-cache.c Josef Bacik
2023-08-25 20:19 ` [PATCH v2 02/12] btrfs: remove btrfs_crc32c wrapper Josef Bacik
2023-08-25 20:19 ` [PATCH v2 03/12] btrfs: move btrfs_extref_hash into inode-item.h Josef Bacik
2023-08-25 20:19 ` [PATCH v2 04/12] btrfs: move btrfs_name_hash to dir-item.h Josef Bacik
2023-08-25 20:19 ` [PATCH v2 05/12] btrfs: include asm/unaligned.h in accessors.h Josef Bacik
2023-08-25 20:19 ` [PATCH v2 06/12] btrfs: include linux/crc32c in dir-item and inode-item Josef Bacik
2023-08-25 20:19 ` [PATCH v2 07/12] btrfs: include linux/iomap.h in file.c Josef Bacik
2023-08-25 20:19 ` [PATCH v2 08/12] btrfs: add fscrypt related dependencies to respective headers Josef Bacik
2023-08-25 20:19 ` [PATCH v2 09/12] btrfs: add btrfs_delayed_ref_head declaration to extent-tree.h Josef Bacik
2023-08-25 20:19 ` Josef Bacik [this message]
2023-08-25 20:19 ` [PATCH v2 11/12] btrfs: include linux/security.h in super.c Josef Bacik
2023-08-25 20:19 ` [PATCH v2 12/12] btrfs: remove extraneous includes from ctree.h Josef Bacik
2023-09-05 13:44 ` David Sterba
2023-08-28 16:25 ` [PATCH v2 00/12] btrfs: ctree.[ch] cleanups Johannes Thumshirn
2023-09-05 13:45 ` David Sterba
2023-09-05 14:38 ` David Sterba
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=59f02409baa3a41239ff61c3cf4c62b2a26501b9.1692994620.git.josef@toxicpanda.com \
--to=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
/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 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).