diff options
| author |   Chengguang Xu <cgxu519@gmx.com> | 2019-02-12 11:24:22 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-12 10:45:45 +0100 |
| commit | 7fadcdce5d3105bf44f2665264738103b26d2e01 (patch) | |
| tree | 32930cf61fda1868fe2d19518ea0fc79907fb858 /drivers/staging/erofs | |
| parent | staging: mt7621-pci: update driver's TODO file (diff) | |
| download | linux-dev-7fadcdce5d3105bf44f2665264738103b26d2e01.tar.xz linux-dev-7fadcdce5d3105bf44f2665264738103b26d2e01.zip | |
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>
Diffstat (limited to 'drivers/staging/erofs')
| -rw-r--r-- | drivers/staging/erofs/namei.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/erofs/namei.c b/drivers/staging/erofs/namei.c index b1752adc5934..27d5e5c90585 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; } |