[31/43] btrfs: hold a ref on the root in btrfs_ioctl_send

Message ID	20200117134758.41494-32-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 31/43] btrfs: hold a ref on the root in btrfs_ioctl_send Date: Fri, 17 Jan 2020 08:47:46 -0500 Message-Id: <20200117134758.41494-32-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-32-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 31/43] btrfs: hold a ref on the root in btrfs_ioctl_send
Date: Fri, 17 Jan 2020 08:47:46 -0500
Message-Id: <20200117134758.41494-32-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

We lookup all the clone roots and the parent root for send, so we need
to hold refs on all of these roots while we're processing them.

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

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 57eae56dd743..ee2fc9ea9d7e 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -7200,11 +7200,17 @@  long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
 				ret = PTR_ERR(clone_root);
 				goto out;
 			}
+			if (!btrfs_grab_fs_root(clone_root)) {
+				srcu_read_unlock(&fs_info->subvol_srcu, index);
+				ret = -ENOENT;
+				goto out;
+			}
 			spin_lock(&clone_root->root_item_lock);
 			if (!btrfs_root_readonly(clone_root) ||
 			    btrfs_root_dead(clone_root)) {
 				spin_unlock(&clone_root->root_item_lock);
 				srcu_read_unlock(&fs_info->subvol_srcu, index);
+				btrfs_put_fs_root(clone_root);
 				ret = -EPERM;
 				goto out;
 			}
@@ -7212,6 +7218,7 @@  long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
 				dedupe_in_progress_warn(clone_root);
 				spin_unlock(&clone_root->root_item_lock);
 				srcu_read_unlock(&fs_info->subvol_srcu, index);
+				btrfs_put_fs_root(clone_root);
 				ret = -EAGAIN;
 				goto out;
 			}
@@ -7239,6 +7246,12 @@  long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
 			ret = PTR_ERR(sctx->parent_root);
 			goto out;
 		}
+		if (!btrfs_grab_fs_root(sctx->parent_root)) {
+			srcu_read_unlock(&fs_info->subvol_srcu, index);
+			ret = -ENOENT;
+			sctx->parent_root = ERR_PTR(ret);
+			goto out;
+		}
 
 		spin_lock(&sctx->parent_root->root_item_lock);
 		sctx->parent_root->send_in_progress++;
@@ -7266,7 +7279,8 @@  long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
 	 * is behind the current send position. This is checked while searching
 	 * for possible clone sources.
 	 */
-	sctx->clone_roots[sctx->clone_roots_cnt++].root = sctx->send_root;
+	sctx->clone_roots[sctx->clone_roots_cnt++].root =
+		btrfs_grab_fs_root(sctx->send_root);
 
 	/* We do a bsearch later */
 	sort(sctx->clone_roots, sctx->clone_roots_cnt,
@@ -7351,18 +7365,24 @@  long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg)
 	}
 
 	if (sort_clone_roots) {
-		for (i = 0; i < sctx->clone_roots_cnt; i++)
+		for (i = 0; i < sctx->clone_roots_cnt; i++) {
 			btrfs_root_dec_send_in_progress(
 					sctx->clone_roots[i].root);
+			btrfs_put_fs_root(sctx->clone_roots[i].root);
+		}
 	} else {
-		for (i = 0; sctx && i < clone_sources_to_rollback; i++)
+		for (i = 0; sctx && i < clone_sources_to_rollback; i++) {
 			btrfs_root_dec_send_in_progress(
 					sctx->clone_roots[i].root);
+			btrfs_put_fs_root(sctx->clone_roots[i].root);
+		}
 
 		btrfs_root_dec_send_in_progress(send_root);
 	}
-	if (sctx && !IS_ERR_OR_NULL(sctx->parent_root))
+	if (sctx && !IS_ERR_OR_NULL(sctx->parent_root)) {
 		btrfs_root_dec_send_in_progress(sctx->parent_root);
+		btrfs_put_fs_root(sctx->parent_root);
+	}
 
 	kvfree(clone_sources_tmp);

[31/43] btrfs: hold a ref on the root in btrfs_ioctl_send

Commit Message

Patch