Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2df0e486 authored by Josef Bacik's avatar Josef Bacik Committed by Greg Kroah-Hartman
Browse files

btrfs: replace BUG_ON with ASSERT in walk_down_proc() 



[ 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: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2d6a7a1e

fs/btrfs/extent-tree.c

+2 −2
Original line number Diff line number Diff line
@@ -8468,7 +8468,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],
@@ -8492,7 +8492,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);