[PATCH 1/2] staging: erofs: remove redundant likely/unlikely annotation in namei.c

[PATCH 1/2] staging: erofs: remove redundant likely/unlikely annotation in namei.c

[Chengguang Xu]

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

Signed-off-by: Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/namei.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/erofs/namei.c b/drivers/staging/erofs/namei.c
index 5596c52e246d..1acd742a41ed 100644
--- a/drivers/staging/erofs/namei.c
+++ b/drivers/staging/erofs/namei.c
@@ -144,7 +144,7 @@ static struct page *find_target_block_classic(
 				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;
 	}
-- 
2.20.1

[PATCH 2/2] staging: erofs: remove redundant unlikely annotation in unzip_vle.c

[Chengguang Xu]

unlikely has already included in IS_ERR(),
so just remove it.

Signed-off-by: Chengguang Xu <cgxu519 at gmx.com>
---
 drivers/staging/erofs/unzip_vle.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c
index 4ac1099a39c6..7cd2d4d9c264 100644
--- a/drivers/staging/erofs/unzip_vle.c
+++ b/drivers/staging/erofs/unzip_vle.c
@@ -539,7 +539,7 @@ static int z_erofs_vle_work_iter_begin(struct z_erofs_vle_work_builder *builder,
 	if (unlikely(work == ERR_PTR(-EAGAIN)))
 		goto repeat;
 
-	if (unlikely(IS_ERR(work)))
+	if (IS_ERR(work))
 		return PTR_ERR(work);
 got_it:
 	z_erofs_pagevec_ctor_init(&builder->vector,
-- 
2.20.1

[PATCH 1/2] staging: erofs: remove redundant likely/unlikely annotation in namei.c

[Gao Xiang]

On 2019/2/12 11:24, Chengguang Xu wrote:
> unlikely has already included in IS_ERR(),
> so just remove redundant likely/unlikely
> annotation.
>
> Signed-off-by: Chengguang Xu <cgxu519 at gmx.com>

Thanks for the correction, and happy new lunar year :)

Reviewed-by: Gao Xiang <gaoxiang25 at huawei.com>


Thanks,

Gao Xiang

[PATCH 2/2] staging: erofs: remove redundant unlikely annotation in unzip_vle.c

[Gao Xiang]

On 2019/2/12 11:24, Chengguang Xu wrote:
> unlikely has already included in IS_ERR(),
> so just remove it.
>
> Signed-off-by: Chengguang Xu <cgxu519 at gmx.com>


Reviewed-by: Gao Xiang <gaoxiang25 at huawei.com>


Thanks,

Gao Xiang

[PATCH 1/2] staging: erofs: remove redundant likely/unlikely annotation in namei.c

[Chao Yu]

On 2019/2/12 11:24, Chengguang Xu wrote:
> unlikely has already included in IS_ERR(),
> so just remove redundant likely/unlikely
> annotation.
> 
> Signed-off-by: Chengguang Xu <cgxu519 at gmx.com>

Reviewed-by: Chao Yu <yuchao0 at huawei.com>

Thanks,

[PATCH 2/2] staging: erofs: remove redundant unlikely annotation in unzip_vle.c

[Chao Yu]

On 2019/2/12 11:24, Chengguang Xu wrote:
> unlikely has already included in IS_ERR(),
> so just remove it.
> 
> Signed-off-by: Chengguang Xu <cgxu519 at gmx.com>

It looks like we don't need to send two patch to fix two similar
issues, if you can merge them, it will be better.

Reviewed-by: Chao Yu <yuchao0 at huawei.com>

Thanks,

[PATCH 2/2] staging: erofs: remove redundant unlikely annotation in unzip_vle.c

[cgxu519]

On 2/13/19 2:36 PM, Chao Yu wrote:
> On 2019/2/12 11:24, Chengguang Xu wrote:
>> unlikely has already included in IS_ERR(),
>> so just remove it.
>>
>> Signed-off-by: Chengguang Xu <cgxu519 at gmx.com>
> It looks like we don't need to send two patch to fix two similar
> issues, if you can merge them, it will be better.
I agree with you but I noticed the patches have already merged to Greg's 
staging tree,
so I'm not sure if it cause inconvenience to his management.

Thanks,
Chengguang

[PATCH 2/2] staging: erofs: remove redundant unlikely annotation in unzip_vle.c

[Gao Xiang]

Hi Chengguang,

On 2019/2/13 22:50, cgxu519 wrote:
>
> On 2/13/19 2:36 PM, Chao Yu wrote:
>> On 2019/2/12 11:24, Chengguang Xu wrote:
>>> unlikely has already included in IS_ERR(),
>>> so just remove it.
>>>
>>> Signed-off-by: Chengguang Xu <cgxu519 at gmx.com>
>> It looks like we don't need to send two patch to fix two similar
>> issues, if you can merge them, it will be better.
> I agree with you but I noticed the patches have already merged to Greg's staging tree,
> so I'm not sure if it cause inconvenience to his management.
>

I personally think it is not a big problem since that is indeed cleanup patches and

thanks for applying erofs patches and happy hacking :)


Thanks,

Gao Xiang


> Thanks,
> Chengguang
>
>