From: Christoph Hellwig <hch@lst.de>
Date: Tue, 15 Nov 2022 09:44:04 +0000 (+0100)
Subject: btrfs: move struct btrfs_tree_parent_check out of disk-io.h
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=27137fac4c0628fc8320bb7f1ce3bb9f84b76a9b;p=linux.git
btrfs: move struct btrfs_tree_parent_check out of disk-io.h
Move struct btrfs_tree_parent_check out of disk-io.h so that volumes.h
an various .c files don't have to include disk-io.h just for it.
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
[ use tree-checker.h for the structure ]
Signed-off-by: David Sterba <dsterba@suse.com>
---
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 55c072ba67471..21c92c74bf71a 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -19,6 +19,7 @@
#include "accessors.h"
#include "extent-tree.h"
#include "relocation.h"
+#include "tree-checker.h"
/* Just arbitrary numbers so we can be sure one of these happened. */
#define BACKREF_FOUND_SHARED 6
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index 03fe4154ffb83..363935cfc0844 100644
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -25,37 +25,9 @@ static inline u64 btrfs_sb_offset(int mirror)
return BTRFS_SUPER_INFO_OFFSET;
}
-/* All the extra info needed to verify the parentness of a tree block. */
-struct btrfs_tree_parent_check {
- /*
- * The owner check against the tree block.
- *
- * Can be 0 to skip the owner check.
- */
- u64 owner_root;
-
- /*
- * Expected transid, can be 0 to skip the check, but such skip
- * should only be utlized for backref walk related code.
- */
- u64 transid;
-
- /*
- * The expected first key.
- *
- * This check can be skipped if @has_first_key is false, such skip
- * can happen for case where we don't have the parent node key,
- * e.g. reading the tree root, doing backref walk.
- */
- struct btrfs_key first_key;
- bool has_first_key;
-
- /* The expected level. Should always be set. */
- u8 level;
-};
-
struct btrfs_device;
struct btrfs_fs_devices;
+struct btrfs_tree_parent_check;
void btrfs_check_leaked_roots(struct btrfs_fs_info *fs_info);
void btrfs_init_fs_info(struct btrfs_fs_info *fs_info);
diff --git a/fs/btrfs/print-tree.c b/fs/btrfs/print-tree.c
index 1469aa55ad482..b93c962133048 100644
--- a/fs/btrfs/print-tree.c
+++ b/fs/btrfs/print-tree.c
@@ -8,6 +8,7 @@
#include "disk-io.h"
#include "print-tree.h"
#include "accessors.h"
+#include "tree-checker.h"
struct root_name_map {
u64 id;
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index e0522c6c0d67a..5c636e00d77da 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -28,6 +28,7 @@
#include "accessors.h"
#include "extent-tree.h"
#include "root-tree.h"
+#include "tree-checker.h"
/*
* Helpers to access qgroup reservation
diff --git a/fs/btrfs/tree-checker.h b/fs/btrfs/tree-checker.h
index ece497e265589..bfb5efa4e01f9 100644
--- a/fs/btrfs/tree-checker.h
+++ b/fs/btrfs/tree-checker.h
@@ -6,8 +6,39 @@
#ifndef BTRFS_TREE_CHECKER_H
#define BTRFS_TREE_CHECKER_H
-#include "ctree.h"
-#include "extent_io.h"
+#include <uapi/linux/btrfs_tree.h>
+
+struct extent_buffer;
+struct btrfs_chunk;
+
+/* All the extra info needed to verify the parentness of a tree block. */
+struct btrfs_tree_parent_check {
+ /*
+ * The owner check against the tree block.
+ *
+ * Can be 0 to skip the owner check.
+ */
+ u64 owner_root;
+
+ /*
+ * Expected transid, can be 0 to skip the check, but such skip
+ * should only be utlized for backref walk related code.
+ */
+ u64 transid;
+
+ /*
+ * The expected first key.
+ *
+ * This check can be skipped if @has_first_key is false, such skip
+ * can happen for case where we don't have the parent node key,
+ * e.g. reading the tree root, doing backref walk.
+ */
+ struct btrfs_key first_key;
+ bool has_first_key;
+
+ /* The expected level. Should always be set. */
+ u8 level;
+};
/*
* Comprehensive leaf checker.
diff --git a/fs/btrfs/tree-mod-log.c b/fs/btrfs/tree-mod-log.c
index 779ad44d285f8..146a6b1989334 100644
--- a/fs/btrfs/tree-mod-log.c
+++ b/fs/btrfs/tree-mod-log.c
@@ -5,6 +5,7 @@
#include "disk-io.h"
#include "fs.h"
#include "accessors.h"
+#include "tree-checker.h"
struct tree_mod_root {
u64 logical;
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 2c90e50c460a3..ab551471c1f8a 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -11,7 +11,7 @@
#include <linux/btrfs.h>
#include "async-thread.h"
#include "messages.h"
-#include "disk-io.h"
+#include "tree-checker.h"
#include "rcu-string.h"
#define BTRFS_MAX_DATA_CHUNK_SIZE (10ULL * SZ_1G)