Commit e3a2713c authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Linus Torvalds

mm/page_isolation: clean up confused code

When there is an isolated_page, post_alloc_hook() is called with page
but __free_pages() is called with isolated_page.  Since they are the
same so no problem but it's very confusing.  To reduce it, this patch
changes isolated_page to boolean type and uses page variable
consistently.

Link: http://lkml.kernel.org/r/1466150259-27727-10-git-send-email-iamjoonsoo.kim@lge.comSigned-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 46f24fd8
...@@ -81,7 +81,7 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype) ...@@ -81,7 +81,7 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype)
{ {
struct zone *zone; struct zone *zone;
unsigned long flags, nr_pages; unsigned long flags, nr_pages;
struct page *isolated_page = NULL; bool isolated_page = false;
unsigned int order; unsigned int order;
unsigned long page_idx, buddy_idx; unsigned long page_idx, buddy_idx;
struct page *buddy; struct page *buddy;
...@@ -109,7 +109,7 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype) ...@@ -109,7 +109,7 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype)
if (pfn_valid_within(page_to_pfn(buddy)) && if (pfn_valid_within(page_to_pfn(buddy)) &&
!is_migrate_isolate_page(buddy)) { !is_migrate_isolate_page(buddy)) {
__isolate_free_page(page, order); __isolate_free_page(page, order);
isolated_page = page; isolated_page = true;
} }
} }
} }
...@@ -129,7 +129,7 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype) ...@@ -129,7 +129,7 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype)
spin_unlock_irqrestore(&zone->lock, flags); spin_unlock_irqrestore(&zone->lock, flags);
if (isolated_page) { if (isolated_page) {
post_alloc_hook(page, order, __GFP_MOVABLE); post_alloc_hook(page, order, __GFP_MOVABLE);
__free_pages(isolated_page, order); __free_pages(page, order);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment