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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 7A649C4338F for ; Wed, 25 Aug 2021 06:31:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 59B1B613A7 for ; Wed, 25 Aug 2021 06:31:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238961AbhHYGce (ORCPT ); Wed, 25 Aug 2021 02:32:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238362AbhHYGc1 (ORCPT ); Wed, 25 Aug 2021 02:32:27 -0400 Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABA7DC061757 for ; Tue, 24 Aug 2021 23:31:42 -0700 (PDT) Received: by mail-qt1-x82c.google.com with SMTP id u21so16012759qtw.8 for ; Tue, 24 Aug 2021 23:31:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qlvI1z1fCV6l+6vZ2EyAPBZvTPzpiJMGsKK1eVy8PQQ=; b=W+Fq67tVvnUH5XoQoUWgccp4wrUWsWBzxbQ6Qw6vc1jQoPFpFFjXEHcnXEqGVCv63J +73EVwbkOZr+RSR4qwElM8xDbuJvJWpxPClNmeFUfDE/T5C2mii6lyfch5T154WtsPlF 48FEj7NzzqCCTjaeWLreGa5oyhd34oC5tzmMu/Mjiq60WeVY8iiGlWuqF/kveWIOqveu ghCAE93QbUcTwUQ5gI5xjxQzmxO/CdmwZnYBkc/W0Ls7xF6J/eXIqPW4yX7blA9GDjga PUKCHld+FmnL0saS9Oxb6j+OIWRummYRXWPekV8IrF5hezA0x/7N1PMA10xjiph/zSYp Nd8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qlvI1z1fCV6l+6vZ2EyAPBZvTPzpiJMGsKK1eVy8PQQ=; b=bXo3fo3FzuHYiCR0m6FJXDF23zujoPjBEi9MqsVK/f4DrW1ggpQpdFG+SCS8QuE0S9 sDxFlqPpItn7viIkXH3DYCfyAZDxyrWt7jddgvavoHspDT9T9tyBOB1rpGX96CETb+N1 vKsxuZ0rBDXzddZvw87Ub8u4BGAX65lY9u3rK/onQs2BT3Q8/PcKcg8iXBJYxMRe24Jn MVuajECuA2xg89GeMlrWBFJBBIG+340hPLosx8uVqBP/KC7xvr2Cn5+5vYRA9zSufnfs ogWGzrPZg4Vt+qif0xWLhTSq2Tg2vWjIc++ne6Px6rH5UG6yQ3OgUgPhVYH7KG4sHPpm XRfA== X-Gm-Message-State: AOAM530q2jE6XozJQ50w3zNdJZNTbXw0gbcr3AKm92Prf+thsI9z//P7 x06c05ywpkHsqYnVKxcpenM= X-Google-Smtp-Source: ABdhPJxOvyzwq6k4wkXWf3bH2J10C0gjxNnf+JrfUPKAK2tIHlB2s6dEK67no4+GfSExe+eBeBi/Ng== X-Received: by 2002:a05:622a:2cc:: with SMTP id a12mr37952327qtx.115.1629873101895; Tue, 24 Aug 2021 23:31:41 -0700 (PDT) Received: from localhost.localdomain ([193.203.214.57]) by smtp.gmail.com with ESMTPSA id m19sm9247058qtx.84.2021.08.24.23.31.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 23:31:41 -0700 (PDT) From: CGEL X-Google-Original-From: CGEL To: Mark Fasheh Cc: Joel Becker , Joseph Qi , Yury Norov , Masahiro Yamada , ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org, Jing Yangyang , Zeal Robot Subject: [PATCH linux-next] fs/ocfs2/dlm/dlmmaster.c: fix bugon.cocci warnings Date: Tue, 24 Aug 2021 23:31:25 -0700 Message-Id: <20210825063125.70192-1-deng.changcheng@zte.com.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jing Yangyang Use BUG_ON instead of a if condition followed by BUG. Generated by: scripts/coccinelle/misc/bugon.cocci Reported-by: Zeal Robot Signed-off-by: Jing Yangyang --- fs/ocfs2/dlm/dlmmaster.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c index 227da5b..afaf9a7 100644 --- a/fs/ocfs2/dlm/dlmmaster.c +++ b/fs/ocfs2/dlm/dlmmaster.c @@ -2181,8 +2181,7 @@ static int dlm_pre_master_reco_lockres(struct dlm_ctxt *dlm, ret = dlm_do_master_requery(dlm, res, nodenum, &master); if (ret < 0) { mlog_errno(ret); - if (!dlm_is_host_down(ret)) - BUG(); + BUG_ON(!dlm_is_host_down(ret)); /* host is down, so answer for that node would be * DLM_LOCK_RES_OWNER_UNKNOWN. continue. */ ret = 0; @@ -2238,8 +2237,7 @@ int dlm_drop_lockres_ref(struct dlm_ctxt *dlm, struct dlm_lock_resource *res) mlog(ML_ERROR, "%s: res %.*s, DEREF to node %u got %d\n", dlm->name, namelen, lockname, res->owner, r); dlm_print_one_lock_resource(res); - if (r == -ENOMEM) - BUG(); + BUG_ON(r == -ENOMEM); } else ret = r; -- 1.8.3.1