[Patch v2] staging: erofs: fix Warning Use BUG_ON instead of if condition followed by BUG

[Patch v2] staging: erofs: fix Warning Use BUG_ON instead of if condition followed by BUG

[Hariprasad Kelam]

fix below warning reported by  coccicheck

drivers/staging/erofs/unzip_pagevec.h:74:2-5: WARNING: Use BUG_ON
instead of if condition followed by BUG.

Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com>
-----
Changes in v2:
  - replace BUG_ON with  DBG_BUGON
-----
---
 drivers/staging/erofs/unzip_pagevec.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/erofs/unzip_pagevec.h b/drivers/staging/erofs/unzip_pagevec.h
index f37d8fd..7938ee3 100644
--- a/drivers/staging/erofs/unzip_pagevec.h
+++ b/drivers/staging/erofs/unzip_pagevec.h
@@ -70,8 +70,7 @@ z_erofs_pagevec_ctor_next_page(struct z_erofs_pagevec_ctor *ctor,
 			return tagptr_unfold_ptr(t);
 	}
 
-	if (unlikely(nr >= ctor->nr))
-		BUG();
+	DBG_BUGON(nr >= ctor->nr);
 
 	return NULL;
 }
-- 
2.7.4

Re: [Patch v2] staging: erofs: fix Warning Use BUG_ON instead of if condition followed by BUG

[Hariprasad Kelam]

On Sun, May 19, 2019 at 05:50:40PM +0800, Gao Xiang wrote:
> 
> 
> On 2019/5/19 下午5:34, Hariprasad Kelam wrote:
> > fix below warning reported by  coccicheck
> > 
> > drivers/staging/erofs/unzip_pagevec.h:74:2-5: WARNING: Use BUG_ON
> > instead of if condition followed by BUG.
> > 
> > Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com>
> > -----
> > Changes in v2:
> >   - replace BUG_ON with  DBG_BUGON
> > -----
> > ---
> >  drivers/staging/erofs/unzip_pagevec.h | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> > 
> > diff --git a/drivers/staging/erofs/unzip_pagevec.h b/drivers/staging/erofs/unzip_pagevec.h
> > index f37d8fd..7938ee3 100644
> > --- a/drivers/staging/erofs/unzip_pagevec.h
> > +++ b/drivers/staging/erofs/unzip_pagevec.h
> > @@ -70,8 +70,7 @@ z_erofs_pagevec_ctor_next_page(struct z_erofs_pagevec_ctor *ctor,
> >  			return tagptr_unfold_ptr(t);
> >  	}
> >  
> 
> I'd like to delete this line
> 
> > -	if (unlikely(nr >= ctor->nr))
> > -		BUG();
> > +	DBG_BUGON(nr >= ctor->nr);
> >  
> 
> and this line.. I have already sent a new patch based on your v1 patch,
> could you please check it out if it is acceptable for you? :)
> 
> Thanks,
> Gao Xiang

Hi Gai Xiang,

The patch which you sent has all required. 
Thanks for the  patch. We can ignore this v2 patch.

Thanks,
Hariprasad k



> >  	return NULL;
> >  }
> > 

Re: [PATCH v2] staging: erofs: fix Warning Use BUG_ON instead of if condition followed by BUG

[Chao Yu]

On 2019/5/19 17:35, Gao Xiang wrote:
> From: Hariprasad Kelam <hariprasad.kelam@gmail.com>
> 
> fix below warning reported by  coccicheck
> 
> drivers/staging/erofs/unzip_pagevec.h:74:2-5: WARNING: Use BUG_ON
> instead of if condition followed by BUG.
> 
> Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com>
> [ Gao Xiang: use DBG_BUGON instead of BUG_ON for eng version only. ]
> Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>

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

Thanks,