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 8E27318C00C; Tue, 10 Sep 2024 10:21:57 +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=1725963717; cv=none; b=WNjI4H0GDLug48H4IJ9FAOKlC1shR62ORaFXXDN9jlW/Y+a7emKlnKh78JkU9NJiKOe5LFs7kKMYi+bGWBjp5oZil6XDGdJtsR34/Hc2qejk7AHWaqZ969VFmd3wy1uYOzIP8CFQEjQ24Jl1geY/yTlNJIUqpQQhN/5TmH3Yq+I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725963717; c=relaxed/simple; bh=5gPLELi1x7BJTBK4NM7QyMmo1223iw/6kn7GQUv45Is=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rBETqRpMEC8FROOM5hxf9EGmAOM7uYavAQ+ReyMSKKnjhdG8QmiY0gBhhpo+rnduRP2TG5DiQQAa8LUvxcfXbkCGfkAjN/o3bH+8Ovhrz0dqnwV5XlITRtxoCqPURHcUqTWXpbxPECwMXoc52zG1VgKcGOMfNsN3dZrDzlAW9/w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VB8aUvXe; 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="VB8aUvXe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15002C4CEC3; Tue, 10 Sep 2024 10:21:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725963717; bh=5gPLELi1x7BJTBK4NM7QyMmo1223iw/6kn7GQUv45Is=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VB8aUvXeeoN5Tz6J8NU7pFrRv/1P+RTZkC4b/AAPkJ7pNPc1cI5z2KOoaUc2PJH3S gLjRhQ6HlAeFzAZHFkyO1kuHkUXhTzEs0/wydCiGbysHEimoEsGykJTkGWgAk6hsae yKa12soATG16R5dRWkl7X6SLIN3CX6pV4l2Um/U4= 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 5.15 153/214] btrfs: replace BUG_ON with ASSERT in walk_down_proc() Date: Tue, 10 Sep 2024 11:32:55 +0200 Message-ID: <20240910092604.988459085@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092558.714365667@linuxfoundation.org> References: <20240910092558.714365667@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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 24cbddc0b36f..ea488b5f5cd8 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -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); -- 2.43.0