staging: erofs: remove redundant likely/unlikely annotation in namei.c
authorChengguang Xu <cgxu519@gmx.com>
Tue, 12 Feb 2019 03:24:22 +0000 (11:24 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Feb 2019 09:45:45 +0000 (10:45 +0100)
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>
drivers/staging/erofs/namei.c

index b1752ad..27d5e5c 100644 (file)
@@ -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;
        }