Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1788626pxb; Fri, 27 Aug 2021 18:09:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIhxQGoZNQvPRjwKUmyHYov3meIc1l34dwLcG79LQyvDnduprZDtgFdkFdhAhAfjd6OT7w X-Received: by 2002:a17:906:8684:: with SMTP id g4mr12560649ejx.262.1630112966990; Fri, 27 Aug 2021 18:09:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630112966; cv=none; d=google.com; s=arc-20160816; b=itYd7DFP+ZKWu4HAqecI9QDCtzWTqgfEfcOuFSRdblxtItwdnifE5dw1AVKGE/hDrD HnsnWnaWxBZZomQ+q7nCRqWfOPAeAT6Xb5vKft80TqP8uE64b0inoIzw2nRtWVMqfyEd nd2vllZiAEECAN3VUbW7kUfkZrUQ+5fcUcDvU6NDQ6pnEfFK5W6pkfh2BPhlM1hOvAuI NY0xD1NZ2tWePUefYcuk6ksRm9TCi0KUKRriCpMd/1vNAULDTU8D/RS4Ha0/4vzPXYO0 EJgNxIIXpMq7VxsMKdCyBBnXSZzAJyZEbCUw2/CRGaZY7IkRd8pSwFxHdfSXilz0b2DM xiSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ycC5EjOXPlt4T7OSVhH11w0K9nPLV+pEuuLBP1af7qg=; b=NmHnooHCqde2UaChScjT4V2AeMk0AycyW5PfzAdW7vus9vfpxITV7Y4iS7djZCQW7p s7woUW7eiax2mHftN7Qg+J0+jh8bzeGJLU08JFgEqngNhYU4uF0T3u8qdns7XBoDXYPx FcKigQcGSgqZ6f2NxjyejcguD4s7yjGMzMOXHmL7YF7NDsFoL/rT7qdohsw8wUvrgRgf pq1FrHYvAcS1el5iwNJ4gACzvZVfN6tMW6jp+yJJwWFEeM6Tl4ZQ+uCAWGhmVD+qoDIQ XMS0fIE6Zs7pG9ExWltTCEQw3Qyxt7HnuK1S5Fk/e2d88F6mWPI1ox22+hahKmi45YsD Fl0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=X3UY66mu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d16si7143616ejm.114.2021.08.27.18.09.01; Fri, 27 Aug 2021 18:09:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=X3UY66mu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232911AbhH1BFf (ORCPT + 99 others); Fri, 27 Aug 2021 21:05:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232861AbhH1BFf (ORCPT ); Fri, 27 Aug 2021 21:05:35 -0400 Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22570C0613D9 for ; Fri, 27 Aug 2021 18:04:45 -0700 (PDT) Received: by mail-qv1-xf2e.google.com with SMTP id eh1so5016941qvb.11 for ; Fri, 27 Aug 2021 18:04:45 -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=ycC5EjOXPlt4T7OSVhH11w0K9nPLV+pEuuLBP1af7qg=; b=X3UY66mu5D5Oa20nbjKyka61OUbcBHu+0Dn+JOelzZCzj45w1vm7IZruetW3O0Utvm wphy/DmOkplxve8ZP0Bf6JcliiO70OF3hk7tIeqTKcZGXOO6vMRATEo6yvc5pq0E6lRi po6R4b1DECzkyvCjjuRUn4rZv5HrrbLP2TEKFhTNBHvJpnTpZD+xuxUh98zUWvY3QxIZ E4xszaIXsDQI4Wuw7Q19OZw0q5J8c0ufjkcZt0VYmdCAATUvlvyNyVlNSwWmG2eWMBr3 ipPPo1R5bZt7X4m8ssQlGBmt+L+LzarNIe3onimTOihVFyb2Jg3CYsgCWmb1aH53/7jA buww== 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=ycC5EjOXPlt4T7OSVhH11w0K9nPLV+pEuuLBP1af7qg=; b=AvR44pjnZ9yDbFj1CiQQg/aN6YB8aXPExP1HlgSN7HLA360TkDrOfXnUV6wqYpx76D RoShAd1OrMRLPFs6UGddY2oQjUudUTsB//frHL2mboRsIWA3uN4Fg8J/3BkZt98s6Lz2 8/F7ZKPGJAAHqCWdx6IbB2rFqw22dbtkmuvRFdm6W63rxh/g/o8qGVTA5QNlalp3ufI6 e7Bl4oXelia5N18RS0/Q8efirsFI2UgB9Q+xqjMfehOqvHVx6YrNB2xM0gmZlhVrtUFP fwolPlgA4IOe0yDI4ZlVI8O/TQfFjJz72ydXQBVTVwtsyQk/o8jUxsp6JAt188UCeCrJ 4oRQ== X-Gm-Message-State: AOAM5300hhXZ+MQBS0mDTOnEj8xAbU0ZjYTIGorluvkRvCVkeT1BYf4P iS2ElFqnng3KNOnHj3T0pTY= X-Received: by 2002:a0c:9043:: with SMTP id o61mr978572qvo.54.1630112684366; Fri, 27 Aug 2021 18:04:44 -0700 (PDT) Received: from localhost.localdomain ([193.203.214.57]) by smtp.gmail.com with ESMTPSA id n18sm5963946qkn.63.2021.08.27.18.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Aug 2021 18:04:44 -0700 (PDT) From: CGEL X-Google-Original-From: CGEL To: Mark Fasheh Cc: Joel Becker , Joseph Qi , ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org, Changcheng Deng , Zeal Robot Subject: [PATCH linux-next] ocfs2: fix bugon.cocci warnings Date: Fri, 27 Aug 2021 18:04:32 -0700 Message-Id: <20210828010432.11100-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: Changcheng Deng Use BUG_ON instead of if condition followed by BUG. Reported-by: Zeal Robot Signed-off-by: Changcheng Deng --- fs/ocfs2/journal.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 4f15750..2305aa5 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c @@ -974,8 +974,7 @@ void ocfs2_journal_shutdown(struct ocfs2_super *osb) goto done; /* need to inc inode use count - jbd2_journal_destroy will iput. */ - if (!igrab(inode)) - BUG(); + BUG_ON(!igrab(inode)); num_running_trans = atomic_read(&(osb->journal->j_num_trans)); trace_ocfs2_journal_shutdown(num_running_trans); @@ -1656,8 +1655,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb, status = jbd2_journal_load(journal); if (status < 0) { mlog_errno(status); - if (!igrab(inode)) - BUG(); + BUG_ON(!igrab(inode)); jbd2_journal_destroy(journal); goto done; } @@ -1686,8 +1684,7 @@ static int ocfs2_replay_journal(struct ocfs2_super *osb, if (status < 0) mlog_errno(status); - if (!igrab(inode)) - BUG(); + BUG_ON(!igrab(inode)); jbd2_journal_destroy(journal); -- 1.8.3.1