diff mbox series

[18/45] btrfs: hold a ref on the root in search_ioctl

Message ID	20191217153635.44733-19-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 18/45] btrfs: hold a ref on the root in search_ioctl Date: Tue, 17 Dec 2019 10:36:08 -0500 Message-Id: <20191217153635.44733-19-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

Commit Message

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

We lookup a arbitrary fs root, we need to hold a ref on that root.  If
we're using our own inodes root then grab a ref on that as well to make
the cleanup easier.

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

diff mbox series

Patch

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 29c363a70fe7..e01363cd2bbe 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -2180,7 +2180,7 @@  static noinline int search_ioctl(struct inode *inode,
 
 	if (sk->tree_id == 0) {
 		/* search the root of the inode that was passed */
-		root = BTRFS_I(inode)->root;
+		root = btrfs_grab_fs_root(BTRFS_I(inode)->root);
 	} else {
 		key.objectid = sk->tree_id;
 		key.type = BTRFS_ROOT_ITEM_KEY;
@@ -2190,6 +2190,10 @@  static noinline int search_ioctl(struct inode *inode,
 			btrfs_free_path(path);
 			return PTR_ERR(root);
 		}
+		if (!btrfs_grab_fs_root(root)) {
+			btrfs_free_path(path);
+			return -ENOENT;
+		}
 	}
 
 	key.objectid = sk->min_objectid;
@@ -2214,6 +2218,7 @@  static noinline int search_ioctl(struct inode *inode,
 		ret = 0;
 err:
 	sk->nr_items = num_found;
+	btrfs_put_fs_root(root);
 	btrfs_free_path(path);
 	return ret;
 }