[06/45] btrfs: kill btrfs_read_fs_root

Message ID	20191217153635.44733-7-josef@toxicpanda.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=yR0V=2H=vger.kernel.org=linux-btrfs-owner@kernel.org> From: Josef Bacik <josef@toxicpanda.com> To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 06/45] btrfs: kill btrfs_read_fs_root Date: Tue, 17 Dec 2019 10:35:56 -0500 Message-Id: <20191217153635.44733-7-josef@toxicpanda.com> In-Reply-To: <20191217153635.44733-1-josef@toxicpanda.com> References: <20191217153635.44733-1-josef@toxicpanda.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk
Series	Cleanup how we handle root refs, part 1 \| expand [0/45,v2] Cleanup how we handle root refs, part 1 [01/45] btrfs: push __setup_root into btrfs_alloc_root [02/45] btrfs: move fs root init stuff into btrfs_init_fs_root [03/45] btrfs: make btrfs_find_orphan_roots use btrfs_get_fs_root [04/45] btrfs: export and use btrfs_read_tree_root [05/45] btrfs: make relocation use btrfs_read_tree_root() [06/45] btrfs: kill btrfs_read_fs_root [07/45] btrfs: kill the btrfs_read_fs_root_no_name helper [08/45] btrfs: make the fs root init functions static [09/45] btrfs: handle NULL roots in btrfs_put/btrfs_grab_fs_root [10/45] btrfs: hold a ref on fs roots while they're in the radix tree [11/45] btrfs: hold a ref on the root in resolve_indirect_ref [12/45] btrfs: hold a root ref in btrfs_get_dentry [13/45] btrfs: hold a ref on the root in __btrfs_run_defrag_inode [14/45] btrfs: hold a ref for the root in record_one_backref [15/45] btrfs: grab a ref on the root in relink_extent_backref [16/45] btrfs: hold a ref on the root in fixup_tree_root_location [17/45] btrfs: hold a ref on the root in create_subvol [18/45] btrfs: hold a ref on the root in search_ioctl [19/45] btrfs: hold a ref on the root in btrfs_search_path_in_tree [20/45] btrfs: hold a ref on the root in btrfs_search_path_in_tree_user [21/45] btrfs: hold a ref on the root in btrfs_ioctl_get_subvol_info [22/45] btrfs: hold ref on root in btrfs_ioctl_default_subvol [23/45] btrfs: hold a ref on the root in build_backref_tree [24/45] btrfs: hold a ref on the root in prepare_to_merge [25/45] btrfs: hold a ref on the root in merge_reloc_roots [26/45] btrfs: hold a ref on the root in record_reloc_root_in_trans [27/45] btrfs: hold a ref on the root in find_data_references [28/45] btrfs: hold a ref on the root in create_reloc_inode [29/45] btrfs: hold a ref on the root in btrfs_recover_relocation [30/45] btrfs: push grab_fs_root into read_fs_root [31/45] btrfs: hold a ref for the root in btrfs_find_orphan_roots [32/45] btrfs: hold a ref on the root in scrub_print_warning_inode [33/45] btrfs: hold a ref on the root in btrfs_ioctl_send [34/45] btrfs: hold a ref on the root in get_subvol_name_from_objectid [35/45] btrfs: hold a ref on the root in create_pending_snapshot [36/45] btrfs: hold a ref on the root in btrfs_recover_log_trees [37/45] btrfs: hold a ref on the root in btrfs_check_uuid_tree_entry [38/45] btrfs: hold a ref on the root in open_ctree [39/45] btrfs: use btrfs_put_fs_root to free roots always [40/45] btrfs: push btrfs_grab_fs_root into btrfs_get_fs_root [41/45] btrfs: free more things in btrfs_free_fs_info [42/45] btrfs: move fs_info init work into it's own helper function [43/45] btrfs: make the init of static elements in fs_info separate [44/45] btrfs: add a leak check for roots [45/45] btrfs: rename btrfs_put_fs_root and btrfs_grab_fs_root

Message ID

20191217153635.44733-7-josef@toxicpanda.com (mailing list archive)

State

New, archived

Headers

From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH 06/45] btrfs: kill btrfs_read_fs_root
Date: Tue, 17 Dec 2019 10:35:56 -0500
Message-Id: <20191217153635.44733-7-josef@toxicpanda.com>
In-Reply-To: <20191217153635.44733-1-josef@toxicpanda.com>
References: <20191217153635.44733-1-josef@toxicpanda.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-btrfs-owner@vger.kernel.org
Precedence: bulk

Series

Cleanup how we handle root refs, part 1 | expand

Commit Message

Josef Bacik Dec. 17, 2019, 3:35 p.m. UTC

All helpers should either be using btrfs_get_fs_root() or
btrfs_read_tree_root().

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
 fs/btrfs/disk-io.c | 13 +------------
 fs/btrfs/disk-io.h |  2 --
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 2b91c40df27a..e3957d6b6bab 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1439,17 +1439,6 @@  struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root,
 	goto out;
 }
 
-struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root,
-				      struct btrfs_key *location)
-{
-	struct btrfs_root *root;
-
-	root = btrfs_read_tree_root(tree_root, location);
-	if (IS_ERR(root))
-		return root;
-	return root;
-}
-
 int btrfs_init_fs_root(struct btrfs_root *root)
 {
 	int ret;
@@ -1570,7 +1559,7 @@  struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info,
 		return root;
 	}
 
-	root = btrfs_read_fs_root(fs_info->tree_root, location);
+	root = btrfs_read_tree_root(fs_info->tree_root, location);
 	if (IS_ERR(root))
 		return root;
 
diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h
index cb12dd4825da..614802bd709d 100644
--- a/fs/btrfs/disk-io.h
+++ b/fs/btrfs/disk-io.h
@@ -60,8 +60,6 @@  int btrfs_read_dev_one_super(struct block_device *bdev, int copy_num,
 int btrfs_commit_super(struct btrfs_fs_info *fs_info);
 struct btrfs_root *btrfs_read_tree_root(struct btrfs_root *tree_root,
 					struct btrfs_key *key);
-struct btrfs_root *btrfs_read_fs_root(struct btrfs_root *tree_root,
-				      struct btrfs_key *location);
 int btrfs_init_fs_root(struct btrfs_root *root);
 struct btrfs_root *btrfs_lookup_fs_root(struct btrfs_fs_info *fs_info,
 					u64 root_id);

[06/45] btrfs: kill btrfs_read_fs_root

Commit Message

Patch