Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp4240521pxu; Mon, 30 Nov 2020 23:07:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJymmSoZyuia0s1KGZf6RF0aHJUKoNqN1YZwPM2vGXYiHZe1ZE3xPlmWkAIew/FdTGBCeVAH X-Received: by 2002:a17:906:6546:: with SMTP id u6mr1780132ejn.36.1606806460498; Mon, 30 Nov 2020 23:07:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606806460; cv=none; d=google.com; s=arc-20160816; b=TDYPTRtO8gI9QwGYZoI7Sw8dRfMr8scGotlYomV7Yy3v4TxDXgMbwS2MHu7vvqSyT7 B+VpTMidODXbY3bcxVlDq1wtC27VMJIUQl38YkNx6GtRnon81UbwObfqOsEg35eg8ZDR AU8JUoxw8Yk4YjDsxabwobOfeGZSOx5Mj9GZOpRUzzl1t6ako/DiAwsa+WuMwCLAa5H5 sflloI/7gBhrWSPlrPT94DcLBQM6QVY6IjsejHfBfs15XnuFovPEfobysoHINEqBqnf6 bUfJuVlAuFtRIqHpH2Bz+oAd51Woi3BKoQkpr1urdKoE1uAo5lRHrjBCj446v/nQj6mg uY3w== 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; bh=e1WdFejGM4g6JGubbx6LonI+jZgw0D+1Efd/Yyxdpg8=; b=0bdCvSarAwp9SdCAcgrc4xbqDd7JccYQqqBsXTqizc2MPdXwCKPs8BBgLTSQJDpFO7 au+k7tqdPVlt8aMGCoFVJjdEyMe+EeHpfuOPGSS5yKX0D0WKG5HOAjJ/ubjkwh3EdPdO KJPt47QsEAqZCC1lVJSFw25vqB8LEdZOQ7Kllhn6o89HmvtcRSi49Y+OCneaoRvXEJPq JT3OUTWndf86hBJ5FxS+Bc4wMIArb5idO06O3Dgil8AebE31+nyBgYzOqcmLoOcdb9Mr WiNL4kkIsmBrbiNZmJoDmVJa3G463/i7vxe4dzKtdnHji9w2fKgdjXOT8h+XK7o/GQwg +7NA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d8si588341edm.404.2020.11.30.23.07.16; Mon, 30 Nov 2020 23:07:40 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727463AbgLAHEy (ORCPT + 99 others); Tue, 1 Dec 2020 02:04:54 -0500 Received: from smtp2207-205.mail.aliyun.com ([121.197.207.205]:38759 "EHLO smtp2207-205.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727096AbgLAHEy (ORCPT ); Tue, 1 Dec 2020 02:04:54 -0500 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.3243493|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_system_inform|0.00467113-0.00219213-0.993137;FP=12105205307651440311|1|1|4|0|-1|-1|-1;HT=ay29a033018047192;MF=huangshuosheng@allwinnertech.com;NM=1;PH=DS;RN=5;RT=5;SR=0;TI=SMTPD_---.J1OSVB1_1606806239; Received: from allwinnertech.com(mailfrom:huangshuosheng@allwinnertech.com fp:SMTPD_---.J1OSVB1_1606806239) by smtp.aliyun-inc.com(10.147.42.135); Tue, 01 Dec 2020 15:04:11 +0800 From: Shuosheng Huang To: jaegeuk@kernel.org, chao@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, tiny.windzz@gmail.com Subject: [PATCH] f2fs: Remove unnecessary unlikely() Date: Tue, 1 Dec 2020 15:03:57 +0800 Message-Id: <20201201070357.851-1-huangshuosheng@allwinnertech.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yangtao Li WARN_ON() already contains an unlikely(), so it's not necessary to use unlikely. Signed-off-by: Yangtao Li --- fs/f2fs/f2fs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index cb700d797296..9f33a508fe51 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -33,10 +33,8 @@ #else #define f2fs_bug_on(sbi, condition) \ do { \ - if (unlikely(condition)) { \ - WARN_ON(1); \ + if (WARN_ON(condition)) \ set_sbi_flag(sbi, SBI_NEED_FSCK); \ - } \ } while (0) #endif -- 2.28.0