From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH 13/15] btrfs: convert correctness BUG_ON()'s to ASSERT()'s in walk_up_proc
Date: Fri, 19 Apr 2024 14:17:08 -0400 [thread overview]
Message-ID: <118364bfc6ec45c519fe92949820eff8896d0837.1713550368.git.josef@toxicpanda.com> (raw)
In-Reply-To: <cover.1713550368.git.josef@toxicpanda.com>
In walk_up_proc we have several sanity checks that should only trip if
the programmer made a mistake. Convert these to ASSERT()'s instead of
BUG_ON()'s.
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
---
fs/btrfs/extent-tree.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 5eb39f405fd5..d3d2f61b7363 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5755,7 +5755,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
u64 parent = 0;
if (wc->stage == UPDATE_BACKREF) {
- BUG_ON(wc->shared_level < level);
+ ASSERT(wc->shared_level >= level);
if (level < wc->shared_level)
goto out;
@@ -5773,7 +5773,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
* count is one.
*/
if (!path->locks[level]) {
- BUG_ON(level == 0);
+ ASSERT(level > 0);
btrfs_tree_lock(eb);
path->locks[level] = BTRFS_WRITE_LOCK;
@@ -5800,7 +5800,7 @@ static noinline int walk_up_proc(struct btrfs_trans_handle *trans,
}
/* wc->stage == DROP_REFERENCE */
- BUG_ON(wc->refs[level] > 1 && !path->locks[level]);
+ ASSERT(path->locks[level] || wc->refs[level] == 1);
if (wc->refs[level] == 1) {
if (level == 0) {
--
2.43.0
next prev parent reply other threads:[~2024-04-19 18:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-19 18:16 [PATCH 00/15] btrfs: snapshot delete cleanups Josef Bacik
2024-04-19 18:16 ` [PATCH 01/15] btrfs: don't do find_extent_buffer in do_walk_down Josef Bacik
2024-04-23 21:55 ` Qu Wenruo
2024-04-19 18:16 ` [PATCH 02/15] btrfs: push ->owner_root check into btrfs_read_extent_buffer Josef Bacik
2024-04-23 22:09 ` Qu Wenruo
2024-04-19 18:16 ` [PATCH 03/15] btrfs: use btrfs_read_extent_buffer in do_walk_down Josef Bacik
2024-04-19 18:16 ` [PATCH 04/15] btrfs: push lookup_info into walk_control Josef Bacik
2024-04-19 18:17 ` [PATCH 05/15] btrfs: move the eb uptodate code into it's own helper Josef Bacik
2024-04-19 18:17 ` [PATCH 06/15] btrfs: remove need_account in do_walk_down Josef Bacik
2024-04-19 18:17 ` [PATCH 07/15] btrfs: unify logic to decide if we need to walk down into a node Josef Bacik
2024-04-19 18:17 ` [PATCH 08/15] btrfs: extract the reference dropping code into it's own helper Josef Bacik
2024-04-19 18:17 ` [PATCH 09/15] btrfs: don't BUG_ON ENOMEM in walk_down_proc Josef Bacik
2024-04-19 18:17 ` [PATCH 10/15] btrfs: handle errors from ref mods during UPDATE_BACKREF Josef Bacik
2024-04-19 18:17 ` [PATCH 11/15] btrfs: replace BUG_ON with ASSERT in walk_down_proc Josef Bacik
2024-04-19 18:17 ` [PATCH 12/15] btrfs: clean up our handling of refs == 0 in snapshot delete Josef Bacik
2024-04-24 12:23 ` David Sterba
2024-04-19 18:17 ` Josef Bacik [this message]
2024-04-19 18:17 ` [PATCH 14/15] btrfs: handle errors from btrfs_dec_ref properly Josef Bacik
2024-04-19 18:17 ` [PATCH 15/15] btrfs: add documentation around snapshot delete Josef Bacik
2024-04-24 12:31 ` [PATCH 00/15] btrfs: snapshot delete cleanups David Sterba
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=118364bfc6ec45c519fe92949820eff8896d0837.1713550368.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).