From: Yangtao Li <tiny.windzz@gmail.com>
Date: Tue, 1 Dec 2020 07:17:39 +0000 (+0800)
Subject: f2fs: Remove unnecessary unlikely()
X-Git-Tag: v5.11-rc1~85^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db48965264110dd74d1436fc21dac328d04385d2;p=thirdparty%2Flinux.git

f2fs: Remove unnecessary unlikely()

WARN_ON() already contains an unlikely(), so it's not necessary
to use unlikely.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
Signed-off-by: Shuosheng Huang <huangshuosheng@allwinnertech.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 90e1fe0ce4bbb..4417f791dbc67 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