korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 07:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Chengguang Xu 2019-02-12 11:24:22 +08:00 committed by Greg Kroah-Hartman
parent 52ec10337c
commit 7fadcdce5d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/erofs/namei.c
View File

@ -144,7 +144,7 @@ exact_out:
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,
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,
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;
} }