Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp4248017pxu; Mon, 30 Nov 2020 23:23:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzWJgiu4AHssL0hFKZTzs3UY7cXMvZBYtNrJGO6tIP5m2wL9IuJ1izWx2N5MzbQZLVRJL9T X-Received: by 2002:a05:6402:1714:: with SMTP id y20mr1722578edu.306.1606807395973; Mon, 30 Nov 2020 23:23:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606807395; cv=none; d=google.com; s=arc-20160816; b=mLisL5+44CFWMJhywm/ZN/ZxbbnHY0RV7inezvcsVHp7/PBFZceXlNGiKwkDM+Jvk1 nQ1+VCP5VFfeBhDKWBAUAY8z7c0CzV7eLvTdiTi2xgZXP2HtrJO4xvE+t3CgZ+pjgkFh ++aeGEV9c8C/BpWXmIbdbhtzl0mgdeuiAQX2kkosRH8m0RsMuvnqy1AR0AqRs3voZ4uA AYCXPP0oAJdQ5KxsnTW+hsZCUrEa6leP1ohCN5xTL/UTQul2/x86Ff96hD8bEZ8yno6I JHyIXtYStNU6d+VAher442gDm1xgv9bOArK/+JpbmlBm1A7QuztH/XRZq8tEXEfgw1yy GBxw== 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=RPso0rbQd+ekFTWZdW89lMYMsYMzNDgMdc1CQbb0Boc=; b=0yZ36LNvEcX4SnabufbihSRSm+WAiEK+VMGLVeYJOzji5Ohm9K93ieikzgLI8zZvb5 5hpZMINzWvmnb9+muQYaU4k+Uas/1NrF6/N/Mlc4Gaax7bFme1N3erNl40bWz3hlFcPN EelWUxeykj9vS/iGImYQtVwusV3/wvc2E31ciSNFsnUcUFdDdgWt/berTnxzoQ15Ho4A TwkKBneSVp3Yr0T36HjFa25WP6XCaUH1O3RhH2Wzu3VyVdbRDP4TqeJXdD4HKgjSlhuG FJtNqYkqmXWd873F7+xdQuQqGr2ik6TCdknAzz73tTDByZaNpmRvKbNDS9ByW4GQGtr5 amfA== 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 k7si603133eds.198.2020.11.30.23.22.53; Mon, 30 Nov 2020 23:23:15 -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 S1727837AbgLAHTI (ORCPT + 99 others); Tue, 1 Dec 2020 02:19:08 -0500 Received: from smtp2207-205.mail.aliyun.com ([121.197.207.205]:60435 "EHLO smtp2207-205.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727451AbgLAHTI (ORCPT ); Tue, 1 Dec 2020 02:19:08 -0500 X-Alimail-AntiSpam: AC=CONTINUE;BC=0.3493923|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_system_inform|0.00510632-0.00277819-0.992115;FP=0|0|0|0|0|-1|-1|-1;HT=ay29a033018047192;MF=huangshuosheng@allwinnertech.com;NM=1;PH=DS;RN=6;RT=6;SR=0;TI=SMTPD_---.J1OL.O9_1606807060; Received: from allwinnertech.com(mailfrom:huangshuosheng@allwinnertech.com fp:SMTPD_---.J1OL.O9_1606807060) by smtp.aliyun-inc.com(10.147.41.137); Tue, 01 Dec 2020 15:18:25 +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, Shuosheng Huang Subject: [PATCH v2] f2fs: Remove unnecessary unlikely() Date: Tue, 1 Dec 2020 15:17:39 +0800 Message-Id: <20201201071739.13301-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 Signed-off-by: Shuosheng Huang --- v2: add Signed-off-by --- 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