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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 B2935C433DF for ; Thu, 18 Jun 2020 01:35:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8505521D7E for ; Thu, 18 Jun 2020 01:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592444121; bh=sqWnOC4iuxz3jVIZiiWhLO+J25Ey9FgoqbsPuaGI4b4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Q30ISA19D9gPc6u/PLFb93esj1i7WAMU6IE8POTkbPjuu5VOhDtJy2+Gb4tfzccao KtsYIfTIfQMQVJzhFA+1/Jyx/ELHkUkON5mWnw1i9UIPsWQez6NVA4HGgqgoIKu52i 1/eFVYjeFpQm4EEYylvEi68H8soPpwpW/CyazLuU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732824AbgFRBbs (ORCPT ); Wed, 17 Jun 2020 21:31:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:38430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732267AbgFRB3Q (ORCPT ); Wed, 17 Jun 2020 21:29:16 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 81FE122209; Thu, 18 Jun 2020 01:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443756; bh=sqWnOC4iuxz3jVIZiiWhLO+J25Ey9FgoqbsPuaGI4b4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XU5Py8DlrCn18DDKj+ew6iZ0vleoA02+p0tLidr8ynnWQ5QnXJAfqj/CtlR7lAn/Z kwOL5OToLre8tx9g4b0z0dkvKT/arXNCnighQGXg+k+8dyvlnl7mmaRmZksSRtkPd5 DDX2C4M0U3/GobJRKgXJa3Z5BBM0pkFO3dPjXj6U= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Arnd Bergmann , Josh Poimboeuf , clang-built-linux@googlegroups.com, David Teigland , Sasha Levin , cluster-devel@redhat.com Subject: [PATCH AUTOSEL 4.9 43/80] dlm: remove BUG() before panic() Date: Wed, 17 Jun 2020 21:27:42 -0400 Message-Id: <20200618012819.609778-43-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012819.609778-1-sashal@kernel.org> References: <20200618012819.609778-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit fe204591cc9480347af7d2d6029b24a62e449486 ] Building a kernel with clang sometimes fails with an objtool error in dlm: fs/dlm/lock.o: warning: objtool: revert_lock_pc()+0xbd: can't find jump dest instruction at .text+0xd7fc The problem is that BUG() never returns and the compiler knows that anything after it is unreachable, however the panic still emits some code that does not get fully eliminated. Having both BUG() and panic() is really pointless as the BUG() kills the current process and the subsequent panic() never hits. In most cases, we probably don't really want either and should replace the DLM_ASSERT() statements with WARN_ON(), as has been done for some of them. Remove the BUG() here so the user at least sees the panic message and we can reliably build randconfig kernels. Fixes: e7fd41792fc0 ("[DLM] The core of the DLM for GFS2/CLVM") Cc: Josh Poimboeuf Cc: clang-built-linux@googlegroups.com Signed-off-by: Arnd Bergmann Signed-off-by: David Teigland Signed-off-by: Sasha Levin --- fs/dlm/dlm_internal.h | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h index 216b61604ef9..c211156aabe2 100644 --- a/fs/dlm/dlm_internal.h +++ b/fs/dlm/dlm_internal.h @@ -100,7 +100,6 @@ do { \ __LINE__, __FILE__, #x, jiffies); \ {do} \ printk("\n"); \ - BUG(); \ panic("DLM: Record message above and reboot.\n"); \ } \ } -- 2.25.1