This is a note to let you know that I've just added the patch titled
mm/compaction: clean-up code on success of ballon isolation
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mm-compaction-clean-up-code-on-success-of-ballon-isolation.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b6c750163c0d138f5041d95fcdbd1094b6928057 Mon Sep 17 00:00:00 2001
From: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Date: Mon, 7 Apr 2014 15:37:07 -0700
Subject: mm/compaction: clean-up code on success of ballon isolation
From: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
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@xxxxxxx>
Acked-by: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Mel Gorman <mgorman@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
mm/compaction.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -562,11 +562,7 @@ isolate_migratepages_range(struct zone *
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;
@@ -627,13 +623,14 @@ isolate_migratepages_range(struct zone *
VM_BUG_ON_PAGE(PageTransCompound(page), 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;
Patches currently in stable-queue which might be from iamjoonsoo.kim@xxxxxxx are
queue-3.14/mm-compaction-avoid-isolating-pinned-pages.patch
queue-3.14/mm-compaction-do-not-call-suitable_migration_target-on-every-page.patch
queue-3.14/mm-compaction-determine-isolation-mode-only-once.patch
queue-3.14/mm-compaction-check-pageblock-suitability-once-per-pageblock.patch
queue-3.14/mm-compaction-clean-up-code-on-success-of-ballon-isolation.patch
queue-3.14/mm-compaction-disallow-high-order-page-for-migration-target.patch
queue-3.14/mm-compaction-change-the-timing-to-check-to-drop-the-spinlock.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html