delayacct: clear right task's flag after blkio completes

[linux-2.6-microblaze.git] / mm / zsmalloc.c

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 30c358b..58697f7 100644 (file)
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1987,8 +1987,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, &dummy, &obj_idx);
@@ -2035,8 +2034,7 @@ unpin_objects:
                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);
                }
        }