Commit 7fadcdce authored by Chengguang Xu's avatar Chengguang Xu Committed by Greg Kroah-Hartman

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: default avatarChengguang Xu <cgxu519@gmx.com>
Reviewed-by: default avatarGao Xiang <gaoxiang25@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 52ec1033
...@@ -144,7 +144,7 @@ static struct page *find_target_block_classic( ...@@ -144,7 +144,7 @@ static struct page *find_target_block_classic(
head = mid + 1; head = mid + 1;
startprfx = matched; startprfx = matched;
if (likely(!IS_ERR(candidate))) if (!IS_ERR(candidate))
put_page(candidate); put_page(candidate);
candidate = page; candidate = page;
} else { } else {
...@@ -177,7 +177,7 @@ int erofs_namei(struct inode *dir, ...@@ -177,7 +177,7 @@ int erofs_namei(struct inode *dir,
diff = 1; diff = 1;
page = find_target_block_classic(dir, name, &diff); page = find_target_block_classic(dir, name, &diff);
if (unlikely(IS_ERR(page))) if (IS_ERR(page))
return PTR_ERR(page); return PTR_ERR(page);
data = kmap_atomic(page); data = kmap_atomic(page);
...@@ -187,7 +187,7 @@ int erofs_namei(struct inode *dir, ...@@ -187,7 +187,7 @@ int erofs_namei(struct inode *dir,
find_target_dirent(name, data, EROFS_BLKSIZ) : find_target_dirent(name, data, EROFS_BLKSIZ) :
(struct erofs_dirent *)data; (struct erofs_dirent *)data;
if (likely(!IS_ERR(de))) { if (!IS_ERR(de)) {
*nid = le64_to_cpu(de->nid); *nid = le64_to_cpu(de->nid);
*d_type = de->file_type; *d_type = de->file_type;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment