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=-17.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_1 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 9075EC4338F for ; Wed, 25 Aug 2021 08:27:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6E1CC610E6 for ; Wed, 25 Aug 2021 08:27:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232084AbhHYI2S (ORCPT ); Wed, 25 Aug 2021 04:28:18 -0400 Received: from out30-56.freemail.mail.aliyun.com ([115.124.30.56]:55927 "EHLO out30-56.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229780AbhHYI2R (ORCPT ); Wed, 25 Aug 2021 04:28:17 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R441e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04420;MF=joseph.qi@linux.alibaba.com;NM=1;PH=DS;RN=10;SR=0;TI=SMTPD_---0Ullo4cF_1629880048; Received: from B-D1K7ML85-0059.local(mailfrom:joseph.qi@linux.alibaba.com fp:SMTPD_---0Ullo4cF_1629880048) by smtp.aliyun-inc.com(127.0.0.1); Wed, 25 Aug 2021 16:27:29 +0800 Subject: Re: [PATCH linux-next] fs/ocfs2/dlm/dlmmaster.c: fix bugon.cocci warnings To: CGEL , Mark Fasheh , akpm Cc: Joel Becker , Yury Norov , Masahiro Yamada , ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org, Jing Yangyang , Zeal Robot References: <20210825063125.70192-1-deng.changcheng@zte.com.cn> From: Joseph Qi Message-ID: <6c5bc597-8ab8-ab7e-6005-656660e9a17a@linux.alibaba.com> Date: Wed, 25 Aug 2021 16:27:28 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20210825063125.70192-1-deng.changcheng@zte.com.cn> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/25/21 2:31 PM, CGEL wrote: > 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 Acked-by: Joseph Qi > --- > 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; > >