diff mbox series

[05/43] btrfs: make relocation use btrfs_read_tree_root()

Message ID	20200117134758.41494-6-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 05/43] btrfs: make relocation use btrfs_read_tree_root() Date: Fri, 17 Jan 2020 08:47:20 -0500 Message-Id: <20200117134758.41494-6-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

Commit Message

Josef Bacik Jan. 17, 2020, 1:47 p.m. UTC

Relocation has it's special roots, we don't want to save these in the
root cache either, so swap it to use btrfs_read_tree_roo().  However the
reloc root does need REF_COWS set, so make sure we set it everywhere we
use this helper, as it no longer does the REF_COWS setting.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
 fs/btrfs/relocation.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 995d4b8b1cfd..aa3aa8e0c0ea 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1447,8 +1447,9 @@  static struct btrfs_root *create_reloc_root(struct btrfs_trans_handle *trans,
 	BUG_ON(ret);
 	kfree(root_item);
 
-	reloc_root = btrfs_read_fs_root(fs_info->tree_root, &root_key);
+	reloc_root = btrfs_read_tree_root(fs_info->tree_root, &root_key);
 	BUG_ON(IS_ERR(reloc_root));
+	set_bit(BTRFS_ROOT_REF_COWS, &reloc_root->state);
 	reloc_root->last_trans = trans->transid;
 	return reloc_root;
 }
@@ -4537,12 +4538,13 @@  int btrfs_recover_relocation(struct btrfs_root *root)
 		    key.type != BTRFS_ROOT_ITEM_KEY)
 			break;
 
-		reloc_root = btrfs_read_fs_root(root, &key);
+		reloc_root = btrfs_read_tree_root(root, &key);
 		if (IS_ERR(reloc_root)) {
 			err = PTR_ERR(reloc_root);
 			goto out;
 		}
 
+		set_bit(BTRFS_ROOT_REF_COWS, &reloc_root->state);
 		list_add(&reloc_root->root_list, &reloc_roots);
 
 		if (btrfs_root_refs(&reloc_root->root_item) > 0) {