]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: replace BUG_ON with ASSERT in walk_down_proc()
authorJosef Bacik <josef@toxicpanda.com>
Tue, 7 May 2024 18:12:12 +0000 (14:12 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Sep 2024 09:07:49 +0000 (11:07 +0200)
[ Upstream commit 1f9d44c0a12730a24f8bb75c5e1102207413cc9b ]

We have a couple of areas where we check to make sure the tree block is
locked before looking up or messing with references.  This is old code
so it has this as BUG_ON().  Convert this to ASSERT() for developers.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/btrfs/extent-tree.c

index 24cbddc0b36f8356db779000e0f3ecae0da2ce8b..ea488b5f5cd8f6a9b5fcd6c48394b125ebbffa0a 100644 (file)
@@ -5086,7 +5086,7 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans,
        if (lookup_info &&
            ((wc->stage == DROP_REFERENCE && wc->refs[level] != 1) ||
             (wc->stage == UPDATE_BACKREF && !(wc->flags[level] & flag)))) {
-               BUG_ON(!path->locks[level]);
+               ASSERT(path->locks[level]);
                ret = btrfs_lookup_extent_info(trans, fs_info,
                                               eb->start, level, 1,
                                               &wc->refs[level],
@@ -5110,7 +5110,7 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans,
 
        /* wc->stage == UPDATE_BACKREF */
        if (!(wc->flags[level] & flag)) {
-               BUG_ON(!path->locks[level]);
+               ASSERT(path->locks[level]);
                ret = btrfs_inc_ref(trans, root, eb, 1);
                BUG_ON(ret); /* -ENOMEM */
                ret = btrfs_dec_ref(trans, root, eb, 0);