From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH v2 03/42] btrfs: convert some BUG_ON()'s to ASSERT()'s in do_relocation
Date: Fri, 13 Nov 2020 11:22:53 -0500 [thread overview]
Message-ID: <229db2e4721b54d83e34728cb4c610b4574563ab.1605284383.git.josef@toxicpanda.com> (raw)
In-Reply-To: <cover.1605284383.git.josef@toxicpanda.com>
A few of these are checking for correctness, and won't be triggered by
corrupted file systems, so convert them to ASSERT() instead of BUG_ON()
and add a comment explaining their existence.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/relocation.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index c5774a8e6ff7..d4cf982c78ff 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -2194,7 +2194,11 @@ static int do_relocation(struct btrfs_trans_handle *trans,
int ret;
int err = 0;
- BUG_ON(lowest && node->eb);
+ /*
+ * If we are lowest then this is the first time we're processing this
+ * block, and thus shouldn't have an eb associated with it yet.
+ */
+ ASSERT(!lowest || !node->eb);
path->lowest_level = node->level + 1;
rc->backref_cache.path[node->level] = node;
@@ -2287,7 +2291,11 @@ static int do_relocation(struct btrfs_trans_handle *trans,
err = ret;
goto next;
}
- BUG_ON(node->eb != eb);
+ /*
+ * We've just cow'ed this block, it should have updated
+ * the correct backref node entry.
+ */
+ ASSERT(node->eb == eb);
} else {
btrfs_set_node_blockptr(upper->eb, slot,
node->eb->start);
@@ -2323,7 +2331,12 @@ static int do_relocation(struct btrfs_trans_handle *trans,
}
path->lowest_level = 0;
- BUG_ON(err == -ENOSPC);
+
+ /*
+ * We should have allocated all of our space in the block rsv and thus
+ * shouldn't ENOSPC.
+ */
+ ASSERT(err != -ENOSPC);
return err;
}
--
2.26.2
next prev parent reply other threads:[~2020-11-13 16:23 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 16:22 [PATCH v2 00/42] Cleanup error handling in relocation Josef Bacik
2020-11-13 16:22 ` [PATCH v2 01/42] btrfs: allow error injection for btrfs_search_slot and btrfs_cow_block Josef Bacik
2020-11-13 16:22 ` [PATCH v2 02/42] btrfs: fix lockdep splat in btrfs_recover_relocation Josef Bacik
2020-11-24 10:44 ` Nikolay Borisov
2020-11-24 16:56 ` Filipe Manana
2020-11-24 18:44 ` Josef Bacik
2020-11-13 16:22 ` Josef Bacik [this message]
2020-11-13 16:22 ` [PATCH v2 04/42] btrfs: convert BUG_ON()'s in relocate_tree_block Josef Bacik
2020-11-13 16:22 ` [PATCH v2 05/42] btrfs: return an error from btrfs_record_root_in_trans Josef Bacik
2020-11-24 11:02 ` Nikolay Borisov
2020-11-24 12:53 ` Nikolay Borisov
2020-11-13 16:22 ` [PATCH v2 06/42] btrfs: handle errors from select_reloc_root() Josef Bacik
2020-11-13 16:22 ` [PATCH v2 07/42] btrfs: convert BUG_ON()'s in select_reloc_root() to proper errors Josef Bacik
2020-11-13 16:22 ` [PATCH v2 08/42] btrfs: check record_root_in_trans related failures in select_reloc_root Josef Bacik
2020-11-13 16:22 ` [PATCH v2 09/42] btrfs: do proper error handling in record_reloc_root_in_trans Josef Bacik
2020-11-13 16:23 ` [PATCH v2 10/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename_exchange Josef Bacik
2020-11-13 16:23 ` [PATCH v2 11/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_rename Josef Bacik
2020-11-13 16:23 ` [PATCH v2 12/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_delete_subvolume Josef Bacik
2020-11-13 16:23 ` [PATCH v2 13/42] btrfs: handle btrfs_record_root_in_trans failure in btrfs_recover_log_trees Josef Bacik
2020-11-24 12:37 ` Nikolay Borisov
2020-12-02 18:05 ` Josef Bacik
2020-11-13 16:23 ` [PATCH v2 14/42] btrfs: handle btrfs_record_root_in_trans failure in create_subvol Josef Bacik
2020-11-24 12:42 ` Nikolay Borisov
2020-12-02 18:12 ` Josef Bacik
2020-11-13 16:23 ` [PATCH v2 15/42] btrfs: btrfs: handle btrfs_record_root_in_trans failure in relocate_tree_block Josef Bacik
2020-11-13 16:23 ` [PATCH v2 16/42] btrfs: handle btrfs_record_root_in_trans failure in start_transaction Josef Bacik
2020-11-13 16:23 ` [PATCH v2 17/42] btrfs: handle record_root_in_trans failure in qgroup_account_snapshot Josef Bacik
2020-11-13 16:23 ` [PATCH v2 18/42] btrfs: handle record_root_in_trans failure in btrfs_record_root_in_trans Josef Bacik
2020-11-13 16:23 ` [PATCH v2 19/42] btrfs: handle record_root_in_trans failure in create_pending_snapshot Josef Bacik
2020-11-13 16:23 ` [PATCH v2 20/42] btrfs: do not panic in __add_reloc_root Josef Bacik
2020-11-24 12:51 ` Nikolay Borisov
2020-11-13 16:23 ` [PATCH v2 21/42] btrfs: have proper error handling in btrfs_init_reloc_root Josef Bacik
2020-11-13 16:23 ` [PATCH v2 22/42] btrfs: do proper error handling in create_reloc_root Josef Bacik
2020-11-13 16:23 ` [PATCH v2 23/42] btrfs: handle btrfs_update_reloc_root failure in commit_fs_roots Josef Bacik
2020-11-13 16:23 ` [PATCH v2 24/42] btrfs: change insert_dirty_subvol to return errors Josef Bacik
2020-11-13 16:23 ` [PATCH v2 25/42] btrfs: handle btrfs_update_reloc_root failure in insert_dirty_subvol Josef Bacik
2020-11-13 16:23 ` [PATCH v2 26/42] btrfs: handle btrfs_update_reloc_root failure in prepare_to_merge Josef Bacik
2020-11-13 16:23 ` [PATCH v2 27/42] btrfs: do proper error handling in btrfs_update_reloc_root Josef Bacik
2020-11-13 16:23 ` [PATCH v2 28/42] btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s Josef Bacik
2020-11-13 16:23 ` [PATCH v2 29/42] btrfs: handle initial btrfs_cow_block error in replace_path Josef Bacik
2020-11-13 16:23 ` [PATCH v2 30/42] btrfs: handle the loop " Josef Bacik
2020-11-13 16:23 ` [PATCH v2 31/42] btrfs: handle btrfs_search_slot failure " Josef Bacik
2020-11-13 16:23 ` [PATCH v2 32/42] btrfs: handle errors in reference count manipulation " Josef Bacik
2020-11-13 16:23 ` [PATCH v2 33/42] btrfs: handle extent reference errors in do_relocation Josef Bacik
2020-11-24 13:15 ` Nikolay Borisov
2020-11-13 16:23 ` [PATCH v2 34/42] btrfs: check for BTRFS_BLOCK_FLAG_FULL_BACKREF being set improperly Josef Bacik
2020-11-13 16:23 ` [PATCH v2 35/42] btrfs: remove the extent item sanity checks in relocate_block_group Josef Bacik
2020-11-13 16:23 ` [PATCH v2 36/42] btrfs: do proper error handling in create_reloc_inode Josef Bacik
2020-11-13 16:23 ` [PATCH v2 37/42] btrfs: handle __add_reloc_root failure in btrfs_recover_relocation Josef Bacik
2020-11-24 13:26 ` Nikolay Borisov
2020-12-02 18:29 ` Josef Bacik
2020-11-13 16:23 ` [PATCH v2 38/42] btrfs: handle __add_reloc_root failure in btrfs_reloc_post_snapshot Josef Bacik
2020-11-13 16:23 ` [PATCH v2 39/42] btrfs: cleanup error handling in prepare_to_merge Josef Bacik
2020-11-13 16:23 ` [PATCH v2 40/42] btrfs: handle extent corruption with select_one_root properly Josef Bacik
2020-11-13 16:23 ` [PATCH v2 41/42] btrfs: do proper error handling in merge_reloc_roots Josef Bacik
2020-11-13 16:23 ` [PATCH v2 42/42] btrfs: check return value of btrfs_commit_transaction in relocation Josef Bacik
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=229db2e4721b54d83e34728cb4c610b4574563ab.1605284383.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).