[PATCH 15/19] btrfs: Rename should_ignore_root() to should_ignore_reloc_root() and export it

Qu Wenruo
2020-03-03T07:15:47Z

This function is mostly single purpose to relocation backref cache, but
since we're moving the main part of backref cache to backref.c, we need
to export such function.

And to avoid confusing, rename the function to
should_ignore_reloc_root() make the name a little more clear.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/ctree.h | 1 +
fs/btrfs/relocation.c | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index b57bb3e5f1f2..e45aad90b45e 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3383,6 +3383,7 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans,
struct btrfs_pending_snapshot *pending);
struct btrfs_root *find_reloc_root(struct btrfs_fs_info *fs_info,
u64 bytenr);
+int should_ignore_reloc_root(struct btrfs_root *root);

/* scrub.c */
int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 349e8e761e8d..2230ea8a3698 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -312,7 +312,7 @@ static bool reloc_root_is_dead(struct btrfs_root *root)
*
* Reloc tree after swap is considered dead, thus not considered as valid.
* This is enough for most callers, as they don't distinguish dead reloc root
- * from no reloc root. But should_ignore_root() below is a special case.
+ * from no reloc root. But should_ignore_reloc_root() below is a special case.
*/
static bool have_reloc_root(struct btrfs_root *root)
{
@@ -323,7 +323,7 @@ static bool have_reloc_root(struct btrfs_root *root)
return true;
}

-static int should_ignore_root(struct btrfs_root *root)
+int should_ignore_reloc_root(struct btrfs_root *root)
{
struct btrfs_root *reloc_root;

@@ -349,6 +349,7 @@ static int should_ignore_root(struct btrfs_root *root)
*/
return 1;
}
+
/*
* find reloc tree by address of tree root
*/
@@ -465,7 +466,7 @@ static int handle_one_tree_backref(struct backref_cache *cache,
/* tree root */
ASSERT(btrfs_root_bytenr(&root->root_item) ==
cur->bytenr);
- if (should_ignore_root(root)) {
+ if (should_ignore_reloc_root(root)) {
btrfs_put_root(root);
list_add(&cur->list, useless_node);
} else {
@@ -506,7 +507,7 @@ static int handle_one_tree_backref(struct backref_cache *cache,
if (!path->nodes[level]) {
ASSERT(btrfs_root_bytenr(&root->root_item) ==
lower->bytenr);
- if (should_ignore_root(root)) {
+ if (should_ignore_reloc_root(root)) {
btrfs_put_root(root);
list_add(&lower->list, useless_node);
} else {
--
2.25.1