diff options
| author | Joonsoo Kim <iamjoonsoo.kim@lge.com> | 2014-08-28 19:34:40 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-09-26 11:51:55 +0200 |
| commit | 0a1802eaa49d84dcd7052afb4c334a0c94af1832 (patch) | |
| tree | 398b7a35d4bedca814002bd941b86254f0c6feb4 /mm | |
| parent | fc8dc0a9f5b062d2b5fbfe368e4d9cdff23ca76b (diff) | |
mm/compaction: clean-up code on success of ballon isolation
commit b6c750163c0d138f5041d95fcdbd1094b6928057 upstream.
It is just for clean-up to reduce code size and improve readability.
There is no functional change.
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/compaction.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index 229c6f7a15c5..10f9f8c0e600 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -560,11 +560,7 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, if (unlikely(balloon_page_movable(page))) { if (locked && balloon_page_isolate(page)) { /* Successfully isolated */ - cc->finished_update_migrate = true; - list_add(&page->lru, migratelist); - cc->nr_migratepages++; - nr_isolated++; - goto check_compact_cluster; + goto isolate_success; } } continue; @@ -625,13 +621,14 @@ isolate_migratepages_range(struct zone *zone, struct compact_control *cc, VM_BUG_ON(PageTransCompound(page)); /* Successfully isolated */ - cc->finished_update_migrate = true; del_page_from_lru_list(page, lruvec, page_lru(page)); + +isolate_success: + cc->finished_update_migrate = true; list_add(&page->lru, migratelist); cc->nr_migratepages++; nr_isolated++; -check_compact_cluster: /* Avoid isolating too much */ if (cc->nr_migratepages == COMPACT_CLUSTER_MAX) { ++low_pfn; |