[06/43] btrfs: kill btrfs_read_fs_root

Message ID	20200117134758.41494-7-josef@toxicpanda.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=6qVc=3G=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/43] btrfs: kill btrfs_read_fs_root Date: Fri, 17 Jan 2020 08:47:21 -0500 Message-Id: <20200117134758.41494-7-josef@toxicpanda.com> In-Reply-To: <20200117134758.41494-1-josef@toxicpanda.com> References: <20200117134758.41494-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 2 \| expand [00/43,v3] Cleanup how we handle root refs, part 2 [01/43] btrfs: push __setup_root into btrfs_alloc_root [02/43] btrfs: move fs root init stuff into btrfs_init_fs_root [03/43] btrfs: make btrfs_find_orphan_roots use btrfs_get_fs_root [04/43] btrfs: export and use btrfs_read_tree_root [05/43] btrfs: make relocation use btrfs_read_tree_root() [06/43] btrfs: kill btrfs_read_fs_root [07/43] btrfs: kill the btrfs_read_fs_root_no_name helper [08/43] btrfs: make the fs root init functions static [09/43] btrfs: handle NULL roots in btrfs_put/btrfs_grab_fs_root [10/43] btrfs: hold a ref on fs roots while they're in the radix tree [11/43] btrfs: hold a ref on the root in resolve_indirect_ref [12/43] btrfs: hold a root ref in btrfs_get_dentry [13/43] btrfs: hold a ref on the root in __btrfs_run_defrag_inode [14/43] btrfs: hold a ref on the root in fixup_tree_root_location [15/43] btrfs: hold a ref on the root in create_subvol [16/43] btrfs: hold a ref on the root in search_ioctl [17/43] btrfs: hold a ref on the root in btrfs_search_path_in_tree [18/43] btrfs: hold a ref on the root in btrfs_search_path_in_tree_user [19/43] btrfs: hold a ref on the root in btrfs_ioctl_get_subvol_info [20/43] btrfs: hold ref on root in btrfs_ioctl_default_subvol [21/43] btrfs: hold a ref on the root in build_backref_tree [22/43] btrfs: hold a ref on the root in prepare_to_merge [23/43] btrfs: hold a ref on the root in merge_reloc_roots [24/43] btrfs: hold a ref on the root in record_reloc_root_in_trans [25/43] btrfs: hold a ref on the root in find_data_references [26/43] btrfs: hold a ref on the root in create_reloc_inode [27/43] btrfs: hold a ref on the root in btrfs_recover_relocation [28/43] btrfs: push grab_fs_root into read_fs_root [29/43] btrfs: hold a ref for the root in btrfs_find_orphan_roots [30/43] btrfs: hold a ref on the root in scrub_print_warning_inode [31/43] btrfs: hold a ref on the root in btrfs_ioctl_send [32/43] btrfs: hold a ref on the root in get_subvol_name_from_objectid [33/43] btrfs: hold a ref on the root in create_pending_snapshot [34/43] btrfs: hold a ref on the root in btrfs_recover_log_trees [35/43] btrfs: hold a ref on the root in btrfs_check_uuid_tree_entry [36/43] btrfs: hold a ref on the root in open_ctree [37/43] btrfs: use btrfs_put_fs_root to free roots always [38/43] btrfs: push btrfs_grab_fs_root into btrfs_get_fs_root [39/43] btrfs: free more things in btrfs_free_fs_info [40/43] btrfs: move fs_info init work into it's own helper function [41/43] btrfs: make the init of static elements in fs_info separate [42/43] btrfs: add a leak check for roots [43/43] btrfs: rename btrfs_put_fs_root and btrfs_grab_fs_root

Message ID

20200117134758.41494-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/43] btrfs: kill btrfs_read_fs_root
Date: Fri, 17 Jan 2020 08:47:21 -0500
Message-Id: <20200117134758.41494-7-josef@toxicpanda.com>
In-Reply-To: <20200117134758.41494-1-josef@toxicpanda.com>
References: <20200117134758.41494-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 2 | expand

Commit Message

Josef Bacik Jan. 17, 2020, 1:47 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 136a4d9d5fed..99755d013dab 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1437,17 +1437,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;
@@ -1568,7 +1557,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 158fec0eeef2..4e43bd37f9c5 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/43] btrfs: kill btrfs_read_fs_root

Commit Message

Patch