From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB38517BEAE; Tue, 10 Sep 2024 09:39:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725961151; cv=none; b=QDnvkUSAKQAHaHQj27p868Uk4sPTHdWTu3zltmQAmHuiIjvtyf5n25UMf0kAq3PVYAKBD6IZtMJUERAzJnoEcYhdF5mZUP9foAnUVwVNsmd5oca5o4m/E8izJhoUCCzkCX6htw7L2khlDZNUCfmpd55OFVKYSL2ipypBXolz5hs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725961151; c=relaxed/simple; bh=ICapJevXh0T6VFJL5op/Z280jw8bRcJDzAu9fMJhTR8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CExDvDdTseRwXbd/vfaorTDR0C1thi9VPgnn3It7NcKLxeYubduA0Ho9DbnVWtwbZJW1lfamkuZnUyA3lqQG2UCDIWycraUYKUd/znUSUaq0aQ/ra6otis3Ahk62Ion7ztWcvkBvz/kW3KyacAPkiLnJnSc515ASCCImhcZGUsE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Z7gcw8Nf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Z7gcw8Nf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F0E8C4CEC3; Tue, 10 Sep 2024 09:39:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725961151; bh=ICapJevXh0T6VFJL5op/Z280jw8bRcJDzAu9fMJhTR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z7gcw8Nf3ytc5HY3w0FF/gZpFtyQDbdACgCBNZSPHK4mUTikWo9kyWTXZaJ5Uk53F KzTYse2JmvNknNkWdKOGJxAe6VWhOsdCncbItigVACeHoxvs8s1n0y5/fnFyJTvV2B KaPB1Fq5OO6kTmvGT58RH7UbWZEZt9Qn/1SeHxfU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Josef Bacik , David Sterba , Sasha Levin Subject: [PATCH 4.19 63/96] btrfs: replace BUG_ON with ASSERT in walk_down_proc() Date: Tue, 10 Sep 2024 11:32:05 +0200 Message-ID: <20240910092544.304371559@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092541.383432924@linuxfoundation.org> References: <20240910092541.383432924@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josef Bacik [ 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 Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/extent-tree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 51f21cd61422..635d51c8098d 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -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); -- 2.43.0