[07/44] btrfs: kill the btrfs_read_fs_root_no_name helper

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

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 99755d013dab..d13791ccb4f6 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3176,7 +3176,7 @@ int __cold open_ctree(struct super_block *sb, location.type = BTRFS_ROOT_ITEM_KEY; location.offset = 0; - fs_info->fs_root = btrfs_read_fs_root_no_name(fs_info, &location); + fs_info->fs_root = btrfs_get_fs_root(fs_info, &location, true); if (IS_ERR(fs_info->fs_root)) { err = PTR_ERR(fs_info->fs_root); btrfs_warn(fs_info, "failed to read fs tree: %d", err); diff --git a/fs/btrfs/disk-io.h b/fs/btrfs/disk-io.h index 4e43bd37f9c5..c2e765edf034 100644 --- a/fs/btrfs/disk-io.h +++ b/fs/btrfs/disk-io.h @@ -70,12 +70,6 @@ void btrfs_free_fs_roots(struct btrfs_fs_info *fs_info); struct btrfs_root *btrfs_get_fs_root(struct btrfs_fs_info *fs_info, struct btrfs_key *key, bool check_ref); -static inline struct btrfs_root * -btrfs_read_fs_root_no_name(struct btrfs_fs_info *fs_info, - struct btrfs_key *location) -{ - return btrfs_get_fs_root(fs_info, location, true); -} int btrfs_cleanup_fs_roots(struct btrfs_fs_info *fs_info); void btrfs_btree_balance_dirty(struct btrfs_fs_info *fs_info); diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c index 72e312cae69d..08cd8c4a02a5 100644 --- a/fs/btrfs/export.c +++ b/fs/btrfs/export.c @@ -77,7 +77,7 @@ static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid, index = srcu_read_lock(&fs_info->subvol_srcu); - root = btrfs_read_fs_root_no_name(fs_info, &key); + root = btrfs_get_fs_root(fs_info, &key, true); if (IS_ERR(root)) { err = PTR_ERR(root); goto fail; diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index a16da274c9aa..565ae8404e1c 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -287,7 +287,7 @@ static int __btrfs_run_defrag_inode(struct btrfs_fs_info *fs_info, index = srcu_read_lock(&fs_info->subvol_srcu); - inode_root = btrfs_read_fs_root_no_name(fs_info, &key); + inode_root = btrfs_get_fs_root(fs_info, &key, true); if (IS_ERR(inode_root)) { ret = PTR_ERR(inode_root); goto cleanup; diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 6d2bb58d277a..8cd1b11c3151 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5021,7 +5021,7 @@ static int fixup_tree_root_location(struct btrfs_fs_info *fs_info, btrfs_release_path(path); - new_root = btrfs_read_fs_root_no_name(fs_info, location); + new_root = btrfs_get_fs_root(fs_info, location, true); if (IS_ERR(new_root)) { err = PTR_ERR(new_root); goto out; diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 0fa1c386d020..958c0245c363 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -666,7 +666,7 @@ static noinline int create_subvol(struct inode *dir, goto fail; key.offset = (u64)-1; - new_root = btrfs_read_fs_root_no_name(fs_info, &key); + new_root = btrfs_get_fs_root(fs_info, &key, true); if (IS_ERR(new_root)) { ret = PTR_ERR(new_root); btrfs_abort_transaction(trans, ret); @@ -2179,7 +2179,7 @@ static noinline int search_ioctl(struct inode *inode, key.objectid = sk->tree_id; key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; - root = btrfs_read_fs_root_no_name(info, &key); + root = btrfs_get_fs_root(info, &key, true); if (IS_ERR(root)) { btrfs_free_path(path); return PTR_ERR(root); @@ -2314,7 +2314,7 @@ static noinline int btrfs_search_path_in_tree(struct btrfs_fs_info *info, key.objectid = tree_id; key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; - root = btrfs_read_fs_root_no_name(info, &key); + root = btrfs_get_fs_root(info, &key, true); if (IS_ERR(root)) { ret = PTR_ERR(root); goto out; @@ -2408,7 +2408,7 @@ static int btrfs_search_path_in_tree_user(struct inode *inode, key.objectid = treeid; key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; - root = btrfs_read_fs_root_no_name(fs_info, &key); + root = btrfs_get_fs_root(fs_info, &key, true); if (IS_ERR(root)) { ret = PTR_ERR(root); goto out; @@ -2653,7 +2653,7 @@ static int btrfs_ioctl_get_subvol_info(struct file *file, void __user *argp) key.objectid = BTRFS_I(inode)->root->root_key.objectid; key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; - root = btrfs_read_fs_root_no_name(fs_info, &key); + root = btrfs_get_fs_root(fs_info, &key, true); if (IS_ERR(root)) { ret = PTR_ERR(root); goto out; @@ -3980,7 +3980,7 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp) location.type = BTRFS_ROOT_ITEM_KEY; location.offset = (u64)-1; - new_root = btrfs_read_fs_root_no_name(fs_info, &location); + new_root = btrfs_get_fs_root(fs_info, &location, true); if (IS_ERR(new_root)) { ret = PTR_ERR(new_root); goto out; diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 22cf69e6e5bc..b5f420456439 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -653,7 +653,7 @@ static int scrub_print_warning_inode(u64 inum, u64 offset, u64 root, root_key.objectid = root; root_key.type = BTRFS_ROOT_ITEM_KEY; root_key.offset = (u64)-1; - local_root = btrfs_read_fs_root_no_name(fs_info, &root_key); + local_root = btrfs_get_fs_root(fs_info, &root_key, true); if (IS_ERR(local_root)) { ret = PTR_ERR(local_root); goto err; diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 091e5bc8c7ea..57eae56dd743 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -7194,7 +7194,7 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg) index = srcu_read_lock(&fs_info->subvol_srcu); - clone_root = btrfs_read_fs_root_no_name(fs_info, &key); + clone_root = btrfs_get_fs_root(fs_info, &key, true); if (IS_ERR(clone_root)) { srcu_read_unlock(&fs_info->subvol_srcu, index); ret = PTR_ERR(clone_root); @@ -7233,7 +7233,7 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg) index = srcu_read_lock(&fs_info->subvol_srcu); - sctx->parent_root = btrfs_read_fs_root_no_name(fs_info, &key); + sctx->parent_root = btrfs_get_fs_root(fs_info, &key, true); if (IS_ERR(sctx->parent_root)) { srcu_read_unlock(&fs_info->subvol_srcu, index); ret = PTR_ERR(sctx->parent_root); diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index a906315efd19..3118bc01321e 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -1096,7 +1096,7 @@ static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info, key.objectid = subvol_objectid; key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; - fs_root = btrfs_read_fs_root_no_name(fs_info, &key); + fs_root = btrfs_get_fs_root(fs_info, &key, true); if (IS_ERR(fs_root)) { ret = PTR_ERR(fs_root); goto err; diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 55d8fd68775a..e194d3e4e3a9 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1631,7 +1631,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, } key.offset = (u64)-1; - pending->snap = btrfs_read_fs_root_no_name(fs_info, &key); + pending->snap = btrfs_get_fs_root(fs_info, &key, true); if (IS_ERR(pending->snap)) { ret = PTR_ERR(pending->snap); btrfs_abort_transaction(trans, ret); diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index e6e4b00cb46c..db803765b500 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -6113,7 +6113,7 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree) tmp_key.type = BTRFS_ROOT_ITEM_KEY; tmp_key.offset = (u64)-1; - wc.replay_dest = btrfs_read_fs_root_no_name(fs_info, &tmp_key); + wc.replay_dest = btrfs_get_fs_root(fs_info, &tmp_key, true); if (IS_ERR(wc.replay_dest)) { ret = PTR_ERR(wc.replay_dest); diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 3d5714bf2e32..ce3eff93c366 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -4375,7 +4375,7 @@ static int btrfs_check_uuid_tree_entry(struct btrfs_fs_info *fs_info, key.objectid = subid; key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; - subvol_root = btrfs_read_fs_root_no_name(fs_info, &key); + subvol_root = btrfs_get_fs_root(fs_info, &key, true); if (IS_ERR(subvol_root)) { ret = PTR_ERR(subvol_root); if (ret == -ENOENT)

[07/44] btrfs: kill the btrfs_read_fs_root_no_name helper

Commit Message

Patch