mm, compaction: cleanup unused functions

Since kswapd compaction moved to kcompactd, compact_pgdat() is not
called anymore, so we remove it.  The only caller of __compact_pgdat()
is compact_node(), so we merge them and remove code that was only
reachable from kswapd.

Link: http://lkml.kernel.org/r/20160810091226.6709-3-vbabka@suse.cz
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Tested-by: Lorenzo Stoakes <lstoakes@gmail.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: David Rientjes <rientjes@google.com>
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>

1 files changed, 17 insertions, 43 deletions

diff --git a/mm/compaction.c b/mm/compaction.c
index c684ca141e4b..8e32778fba5b 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -1736,10 +1736,18 @@ enum compact_result try_to_compact_pages(gfp_t gfp_mask, unsigned int order,
 
 
 /* Compact all zones within a node */
-static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)
+static void compact_node(int nid)
 {
+        pg_data_t *pgdat = NODE_DATA(nid);
         int zoneid;
         struct zone *zone;
+        struct compact_control cc = {
+                .order = -1,
+                .mode = MIGRATE_SYNC,
+                .ignore_skip_hint = true,
+                .whole_zone = true,
+        };
+
 
         for (zoneid = 0; zoneid < MAX_NR_ZONES; zoneid++) {
 
@@ -1747,53 +1755,19 @@ static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)
                 if (!populated_zone(zone))
                         continue;
 
-                cc->nr_freepages = 0;
-                cc->nr_migratepages = 0;
-                cc->zone = zone;
-                INIT_LIST_HEAD(&cc->freepages);
-                INIT_LIST_HEAD(&cc->migratepages);
-
-                if (is_via_compact_memory(cc->order) ||
-                                !compaction_deferred(zone, cc->order))
-                        compact_zone(zone, cc);
-
-                VM_BUG_ON(!list_empty(&cc->freepages));
-                VM_BUG_ON(!list_empty(&cc->migratepages));
+                cc.nr_freepages = 0;
+                cc.nr_migratepages = 0;
+                cc.zone = zone;
+                INIT_LIST_HEAD(&cc.freepages);
+                INIT_LIST_HEAD(&cc.migratepages);
 
-                if (is_via_compact_memory(cc->order))
-                        continue;
+                compact_zone(zone, &cc);
 
-                if (zone_watermark_ok(zone, cc->order,
-                                low_wmark_pages(zone), 0, 0))
-                        compaction_defer_reset(zone, cc->order, false);
+                VM_BUG_ON(!list_empty(&cc.freepages));
+                VM_BUG_ON(!list_empty(&cc.migratepages));
         }
 }
 
-void compact_pgdat(pg_data_t *pgdat, int order)
-{
-        struct compact_control cc = {
-                .order = order,
-                .mode = MIGRATE_ASYNC,
-        };
-
-        if (!order)
-                return;
-
-        __compact_pgdat(pgdat, &cc);
-}
-
-static void compact_node(int nid)
-{
-        struct compact_control cc = {
-                .order = -1,
-                .mode = MIGRATE_SYNC,
-                .ignore_skip_hint = true,
-                .whole_zone = true,
-        };
-
-        __compact_pgdat(NODE_DATA(nid), &cc);
-}
-
 /* Compact all nodes in the system */
 static void compact_nodes(void)
 {