diff mbox series

[20/42] btrfs: do not panic in __add_reloc_root

Message ID	1fcb0ba77d7d8adbf89a726e6d5aea81dc2346c8.1605215645.git.josef@toxicpanda.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-btrfs-owner@kernel.org> From: Josef Bacik <josef@toxicpanda.com> To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 20/42] btrfs: do not panic in __add_reloc_root Date: Thu, 12 Nov 2020 16:18:47 -0500 Message-Id: <1fcb0ba77d7d8adbf89a726e6d5aea81dc2346c8.1605215645.git.josef@toxicpanda.com> In-Reply-To: <cover.1605215645.git.josef@toxicpanda.com> References: <cover.1605215645.git.josef@toxicpanda.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Cleanup error handling in relocation \| expand [00/42] Cleanup error handling in relocation [01/42] btrfs: allow error injection for btrfs_search_slot and btrfs_cow_block [02/42] btrfs: fix lockdep splat in btrfs_recover_relocation [03/42] btrfs: convert some BUG_ON()'s to ASSERT()'s in do_relocation [04/42] btrfs: convert BUG_ON()'s in relocate_tree_block [05/42] btrfs: return an error from btrfs_record_root_in_trans [06/42] btrfs: handle errors from select_reloc_root() [07/42] btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors [09/42] btrfs: do proper error handling in record_reloc_root_in_trans [10/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename_exchange [11/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename [12/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume [13/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_recover_log_trees [14/42] btrfs: handle btrfs_record_root_in_trans failure in create_subvol [15/42] btrfs: btrfs: handle btrfs_record_root_in_trans failure in relocate_tree_block [16/42] btrfs: handle btrfs_record_root_in_trans failure in start_transaction [17/42] btrfs: handle record_root_in_trans failure in qgroup_account_snapshot [18/42] btrfs: handle record_root_in_trans failure in btrfs_record_root_in_trans [19/42] btrfs: handle record_root_in_trans failure in create_pending_snapshot [20/42] btrfs: do not panic in __add_reloc_root [21/42] btrfs: have proper error handling in btrfs_init_reloc_root [22/42] btrfs: do proper error handling in create_reloc_root [23/42] btrfs: handle btrfs_update_reloc_root failure in commit_fs_roots [24/42] btrfs: change insert_dirty_subvol to return errors [25/42] btrfs: handle btrfs_update_reloc_root failure in insert_dirty_subvol [26/42] btrfs: handle btrfs_update_reloc_root failure in prepare_to_merge [27/42] btrfs: do proper error handling in btrfs_update_reloc_root [28/42] btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s [29/42] btrfs: handle initial btrfs_cow_block error in replace_path [30/42] btrfs: handle the loop btrfs_cow_block error in replace_path [31/42] btrfs: handle btrfs_search_slot failure in replace_path [32/42] btrfs: handle errors in reference count manipulation in replace_path [33/42] btrfs: handle extent reference errors in do_relocation [34/42] btrfs: check for BTRFS_BLOCK_FLAG_FULL_BACKREF being set improperly [35/42] btrfs: remove the extent item sanity checks in relocate_block_group [36/42] btrfs: do proper error handling in create_reloc_inode [37/42] btrfs: handle __add_reloc_root failure in btrfs_recover_relocation [38/42] btrfs: handle __add_reloc_root failure in btrfs_reloc_post_snapshot [39/42] btrfs: cleanup error handling in prepare_to_merge [40/42] btrfs: handle extent corruption with select_one_root properly [41/42] btrfs: do proper error handling in merge_reloc_roots [42/42] btrfs: check return value of btrfs_commit_transaction in relocation

Commit Message

Josef Bacik Nov. 12, 2020, 9:18 p.m. UTC

If we have a duplicate entry for a reloc root then we could have fs
corruption that resulted in a double allocation.  This shouldn't happen
generally so leave an ASSERT() for this case, but return an error
instead of panicing in the normal user case.

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

diff mbox series

Patch

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 4d6f898025e5..1627e1378b35 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -637,10 +637,12 @@  static int __must_check __add_reloc_root(struct btrfs_root *root)
 	rb_node = rb_simple_insert(&rc->reloc_root_tree.rb_root,
 				   node->bytenr, &node->rb_node);
 	spin_unlock(&rc->reloc_root_tree.lock);
+	ASSERT(rb_node == NULL);
 	if (rb_node) {
-		btrfs_panic(fs_info, -EEXIST,
+		btrfs_err(fs_info,
 			    "Duplicate root found for start=%llu while inserting into relocation tree",
 			    node->bytenr);
+		return -EEXIST;
 	}
 
 	list_add_tail(&root->root_list, &rc->reloc_roots);