All of lore.kernel.org
 help / color / mirror / Atom feed
From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH v7 06/38] btrfs: do proper error handling in record_reloc_root_in_trans
Date: Wed, 16 Dec 2020 11:26:22 -0500	[thread overview]
Message-ID: <0ce7243af178dae7f029f5a2513a230bf8859328.1608135849.git.josef@toxicpanda.com> (raw)
In-Reply-To: <cover.1608135849.git.josef@toxicpanda.com>

Generally speaking this shouldn't ever fail, the corresponding fs root
for the reloc root will already be in memory, so we won't get -ENOMEM
here.

However if there is no corresponding root for the reloc root then we
could get -ENOMEM when we try to allocate it or we could get -ENOENT
when we look it up and see that it doesn't exist.

Convert these BUG_ON()'s into ASSERT()'s + proper error handling for the
case of corruption.

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

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 1c36b10fdd02..0eea27d9e3cf 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -1971,8 +1971,27 @@ static int record_reloc_root_in_trans(struct btrfs_trans_handle *trans,
 		return 0;
 
 	root = btrfs_get_fs_root(fs_info, reloc_root->root_key.offset, false);
-	BUG_ON(IS_ERR(root));
-	BUG_ON(root->reloc_root != reloc_root);
+
+	/*
+	 * This should succeed, since we can't have a reloc root without having
+	 * already looked up the actual root and created the reloc root for this
+	 * root.
+	 *
+	 * However if there's some sort of corruption where we have a ref to a
+	 * reloc root without a corresponding root this could return -ENOENT.
+	 */
+	if (IS_ERR(root)) {
+		ASSERT(0);
+		return PTR_ERR(root);
+	}
+	if (root->reloc_root != reloc_root) {
+		ASSERT(0);
+		btrfs_err(fs_info,
+			  "root %llu has two reloc roots associated with it",
+			  reloc_root->root_key.offset);
+		btrfs_put_root(root);
+		return -EUCLEAN;
+	}
 	ret = btrfs_record_root_in_trans(trans, root);
 	btrfs_put_root(root);
 
-- 
2.26.2


  parent reply	other threads:[~2020-12-16 16:28 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-16 16:26 [PATCH v7 00/38] Cleanup error handling in relocation Josef Bacik
2020-12-16 16:26 ` [PATCH v7 01/38] btrfs: convert BUG_ON()'s in relocate_tree_block Josef Bacik
2020-12-16 16:26 ` [PATCH v7 02/38] btrfs: return an error from btrfs_record_root_in_trans Josef Bacik
2021-02-26 19:03   ` David Sterba
2020-12-16 16:26 ` [PATCH v7 03/38] btrfs: handle errors from select_reloc_root() Josef Bacik
2021-02-26 18:30   ` David Sterba
2021-03-11 18:10     ` Josef Bacik
2021-04-09 19:24       ` David Sterba
2020-12-16 16:26 ` [PATCH v7 04/38] btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors Josef Bacik
2020-12-16 16:26 ` [PATCH v7 05/38] btrfs: check record_root_in_trans related failures in select_reloc_root Josef Bacik
2020-12-16 16:26 ` Josef Bacik [this message]
2020-12-16 16:26 ` [PATCH v7 07/38] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename_exchange Josef Bacik
2020-12-16 16:26 ` [PATCH v7 08/38] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename Josef Bacik
2020-12-16 16:26 ` [PATCH v7 09/38] btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume Josef Bacik
2020-12-16 16:26 ` [PATCH v7 10/38] btrfs: handle btrfs_record_root_in_trans failure in btrfs_recover_log_trees Josef Bacik
2020-12-16 16:26 ` [PATCH v7 11/38] btrfs: handle btrfs_record_root_in_trans failure in create_subvol Josef Bacik
2020-12-16 16:26 ` [PATCH v7 12/38] btrfs: btrfs: handle btrfs_record_root_in_trans failure in relocate_tree_block Josef Bacik
2020-12-16 16:26 ` [PATCH v7 13/38] btrfs: handle btrfs_record_root_in_trans failure in start_transaction Josef Bacik
2020-12-16 16:26 ` [PATCH v7 14/38] btrfs: handle record_root_in_trans failure in qgroup_account_snapshot Josef Bacik
2020-12-16 16:26 ` [PATCH v7 15/38] btrfs: handle record_root_in_trans failure in btrfs_record_root_in_trans Josef Bacik
2020-12-16 16:26 ` [PATCH v7 16/38] btrfs: handle record_root_in_trans failure in create_pending_snapshot Josef Bacik
2020-12-16 16:26 ` [PATCH v7 17/38] btrfs: do not panic in __add_reloc_root Josef Bacik
2020-12-16 16:26 ` [PATCH v7 18/38] btrfs: have proper error handling in btrfs_init_reloc_root Josef Bacik
2020-12-16 16:26 ` [PATCH v7 19/38] btrfs: do proper error handling in create_reloc_root Josef Bacik
2020-12-16 16:26 ` [PATCH v7 20/38] btrfs: validate ->reloc_root after recording root in trans Josef Bacik
2020-12-16 16:26 ` [PATCH v7 21/38] btrfs: handle btrfs_update_reloc_root failure in commit_fs_roots Josef Bacik
2020-12-16 16:26 ` [PATCH v7 22/38] btrfs: change insert_dirty_subvol to return errors Josef Bacik
2020-12-16 16:26 ` [PATCH v7 23/38] btrfs: handle btrfs_update_reloc_root failure in insert_dirty_subvol Josef Bacik
2020-12-16 16:26 ` [PATCH v7 24/38] btrfs: handle btrfs_update_reloc_root failure in prepare_to_merge Josef Bacik
2020-12-16 16:26 ` [PATCH v7 25/38] btrfs: do proper error handling in btrfs_update_reloc_root Josef Bacik
2020-12-16 16:26 ` [PATCH v7 26/38] btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s Josef Bacik
2020-12-16 16:26 ` [PATCH v7 27/38] btrfs: handle btrfs_cow_block errors in replace_path Josef Bacik
2020-12-16 16:26 ` [PATCH v7 28/38] btrfs: handle btrfs_search_slot failure " Josef Bacik
2020-12-16 16:26 ` [PATCH v7 29/38] btrfs: handle errors in reference count manipulation " Josef Bacik
2020-12-16 16:26 ` [PATCH v7 30/38] btrfs: handle extent reference errors in do_relocation Josef Bacik
2020-12-16 16:26 ` [PATCH v7 31/38] btrfs: check for BTRFS_BLOCK_FLAG_FULL_BACKREF being set improperly Josef Bacik
2020-12-16 16:26 ` [PATCH v7 32/38] btrfs: remove the extent item sanity checks in relocate_block_group Josef Bacik
2020-12-16 16:26 ` [PATCH v7 33/38] btrfs: do proper error handling in create_reloc_inode Josef Bacik
2020-12-16 16:26 ` [PATCH v7 34/38] btrfs: handle __add_reloc_root failures in btrfs_recover_relocation Josef Bacik
2020-12-16 16:26 ` [PATCH v7 35/38] btrfs: cleanup error handling in prepare_to_merge Josef Bacik
2020-12-16 16:26 ` [PATCH v7 36/38] btrfs: handle extent corruption with select_one_root properly Josef Bacik
2020-12-16 16:26 ` [PATCH v7 37/38] btrfs: do proper error handling in merge_reloc_roots Josef Bacik
2020-12-16 16:26 ` [PATCH v7 38/38] btrfs: check return value of btrfs_commit_transaction in relocation Josef Bacik
2020-12-16 19:56 ` [PATCH v7 00/38] Cleanup error handling " Zygo Blaxell
2020-12-18 16:25   ` Zygo Blaxell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0ce7243af178dae7f029f5a2513a230bf8859328.1608135849.git.josef@toxicpanda.com \
    --to=josef@toxicpanda.com \
    --cc=kernel-team@fb.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.