Re: [PATCH] mm/zsmalloc: replace if (cond) BUG() with BUG_ON()

2020-12-21 Thread Minchan Kim
On Sat, Dec 12, 2020 at 11:26:25AM +0800, Alex Shi wrote:
> coccinelle reports some warning:
> WARNING: Use BUG_ON instead of if condition followed by BUG.
> 
> It could be fixed by BUG_ON().
> 
> Reported-by: ab...@linux.alibaba.com
> Signed-off-by: Alex Shi 

Acked-by: Minchan Kim 

Thanks.


[PATCH] mm/zsmalloc: replace if (cond) BUG() with BUG_ON()

2020-12-11 Thread Alex Shi
coccinelle reports some warning:
WARNING: Use BUG_ON instead of if condition followed by BUG.

It could be fixed by BUG_ON().

Reported-by: ab...@linux.alibaba.com
Signed-off-by: Alex Shi 
Cc: Minchan Kim 
Cc: Nitin Gupta 
Cc: Sergey Senozhatsky 
Cc: Andrew Morton 
Cc: linux...@kvack.org
Cc: linux-kernel@vger.kernel.org
---
 mm/zsmalloc.c | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 7289f502ffac..1ea0605dbe94 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1988,8 +1988,7 @@ static int zs_page_migrate(struct address_space *mapping, 
struct page *newpage,
head = obj_to_head(page, addr);
if (head & OBJ_ALLOCATED_TAG) {
handle = head & ~OBJ_ALLOCATED_TAG;
-   if (!testpin_tag(handle))
-   BUG();
+   BUG_ON(!testpin_tag(handle));
 
old_obj = handle_to_obj(handle);
obj_to_location(old_obj, , _idx);
@@ -2036,8 +2035,8 @@ static int zs_page_migrate(struct address_space *mapping, 
struct page *newpage,
head = obj_to_head(page, addr);
if (head & OBJ_ALLOCATED_TAG) {
handle = head & ~OBJ_ALLOCATED_TAG;
-   if (!testpin_tag(handle))
-   BUG();
+   BUG_ON(!testpin_tag(handle));
+
unpin_tag(handle);
}
}
-- 
2.29.GIT