From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED454C433B4 for ; Sun, 2 May 2021 14:09:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1D96611EE for ; Sun, 2 May 2021 14:09:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232859AbhEBOKp (ORCPT ); Sun, 2 May 2021 10:10:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:50118 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233823AbhEBOH4 (ORCPT ); Sun, 2 May 2021 10:07:56 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6721C613B0; Sun, 2 May 2021 14:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619964382; bh=VRyj2C4fw0+764fRhWcRU66cC58F8EgHyHp56UeQyrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L1xrMxtCeJgnjzixYNzwk5BuSW1eQ/BJlV0Xip9SH6nd4R1a9DOiKz1X5oAAxKZUu O1QdGaxbyd3uWuF592dYQypyrxYzbC4ugJ1GkpQg8zfcHLj07sFCS2XU9LBFuAtCuB 7ehiMpxrsVMVuAvngS05r3KAWxKAwAPMwRxfb905ns6cCQzpfruVYowkvvundW52/s bxbLPZ210Dy1wE0kon1diB+IawSC5NlJ6AqCFi+wLii6qnNfT/TtOJJV5YSObn1edz jakg3P9HqlaK3HZfyBUQbl8klXedhs6l7iwi6qRpqZp5tWuOavDujLrQTk8TDzB3M3 7RvHn01SZRunA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Josef Bacik , Qu Wenruo , David Sterba , Sasha Levin , linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 12/12] btrfs: convert logic BUG_ON()'s in replace_path to ASSERT()'s Date: Sun, 2 May 2021 10:06:06 -0400 Message-Id: <20210502140606.2720323-12-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210502140606.2720323-1-sashal@kernel.org> References: <20210502140606.2720323-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Josef Bacik [ Upstream commit 7a9213a93546e7eaef90e6e153af6b8fc7553f10 ] A few BUG_ON()'s in replace_path are purely to keep us from making logical mistakes, so replace them with ASSERT()'s. Reviewed-by: Qu Wenruo Signed-off-by: Josef Bacik Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/relocation.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index cd5b86d80e7a..5caf4dbdd801 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -1801,8 +1801,8 @@ int replace_path(struct btrfs_trans_handle *trans, int ret; int slot; - BUG_ON(src->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID); - BUG_ON(dest->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID); + ASSERT(src->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID); + ASSERT(dest->root_key.objectid != BTRFS_TREE_RELOC_OBJECTID); last_snapshot = btrfs_root_last_snapshot(&src->root_item); again: @@ -1834,7 +1834,7 @@ int replace_path(struct btrfs_trans_handle *trans, parent = eb; while (1) { level = btrfs_header_level(parent); - BUG_ON(level < lowest_level); + ASSERT(level >= lowest_level); ret = btrfs_bin_search(parent, &key, level, &slot); if (ret && slot > 0) -- 2.30.2