From: Chengguang Xu <cgxu519@gmx.com>
Date: Tue, 12 Feb 2019 03:24:22 +0000 (+0800)
Subject: staging: erofs: remove redundant likely/unlikely annotation in namei.c
X-Git-Tag: v5.4-rc1~1509^2~82
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7fadcdce5d3105bf44f2665264738103b26d2e01;p=platform%2Fkernel%2Flinux-rpi.git

staging: erofs: remove redundant likely/unlikely annotation in namei.c

unlikely has already included in IS_ERR(),
so just remove redundant likely/unlikely
annotation.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Reviewed-by: Gao Xiang <gaoxiang25@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/erofs/namei.c b/drivers/staging/erofs/namei.c
index b1752ad..27d5e5c 100644
--- a/drivers/staging/erofs/namei.c
+++ b/drivers/staging/erofs/namei.c
@@ -144,7 +144,7 @@ exact_out:
 				head = mid + 1;
 				startprfx = matched;
 
-				if (likely(!IS_ERR(candidate)))
+				if (!IS_ERR(candidate))
 					put_page(candidate);
 				candidate = page;
 			} else {
@@ -177,7 +177,7 @@ int erofs_namei(struct inode *dir,
 	diff = 1;
 	page = find_target_block_classic(dir, name, &diff);
 
-	if (unlikely(IS_ERR(page)))
+	if (IS_ERR(page))
 		return PTR_ERR(page);
 
 	data = kmap_atomic(page);
@@ -187,7 +187,7 @@ int erofs_namei(struct inode *dir,
 		find_target_dirent(name, data, EROFS_BLKSIZ) :
 		(struct erofs_dirent *)data;
 
-	if (likely(!IS_ERR(de))) {
+	if (!IS_ERR(de)) {
 		*nid = le64_to_cpu(de->nid);
 		*d_type = de->file_type;
 	}