[Devel] [PATCH RHEL7 COMMIT] ms/mm/compaction: clean up unused code lines

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-693.11.6.vz7.42.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.11.6.vz7.42.4
------>
commit a09c351e662a4e18e63625a8f84ce3ccde9f43d6
Author: Heesub Shin <heesub.shin at samsung.com>
Date:   Wed Jan 31 18:21:57 2018 +0300

    ms/mm/compaction: clean up unused code lines
    
    Remove code lines currently not in use or never called.
    
    Signed-off-by: Heesub Shin <heesub.shin at samsung.com>
    Acked-by: Vlastimil Babka <vbabka at suse.cz>
    Cc: Dongjun Shin <d.j.shin at samsung.com>
    Cc: Sunghwan Yun <sunghwan.yun at samsung.com>
    Cc: Minchan Kim <minchan at kernel.org>
    Cc: Mel Gorman <mgorman at suse.de>
    Cc: Joonsoo Kim <iamjoonsoo.kim at lge.com>
    Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie at samsung.com>
    Cc: Michal Nazarewicz <mina86 at mina86.com>
    Cc: Naoya Horiguchi <n-horiguchi at ah.jp.nec.com>
    Cc: Christoph Lameter <cl at linux.com>
    Cc: Rik van Riel <riel at redhat.com>
    Cc: Dongjun Shin <d.j.shin at samsung.com>
    Cc: Sunghwan Yun <sunghwan.yun at samsung.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
    (cherry picked from commit 13fb44e4b0414d7e718433a49e6430d5b76bd46e)
    Signed-off-by: Andrey Ryabinin <aryabinin at virtuozzo.com>
---
 mm/compaction.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/mm/compaction.c b/mm/compaction.c
index ee0c1e4aecd7..ea44b4bf85d9 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -210,12 +210,6 @@ static bool compact_checklock_irqsave(spinlock_t *lock, unsigned long *flags,
 	return true;
 }
 
-static inline bool compact_trylock_irqsave(spinlock_t *lock,
-			unsigned long *flags, struct compact_control *cc)
-{
-	return compact_checklock_irqsave(lock, flags, false, cc);
-}
-
 /* Returns true if the page is within a block suitable for migration to */
 static bool suitable_migration_target(struct page *page)
 {
@@ -740,7 +734,6 @@ static void isolate_freepages(struct zone *zone,
 			continue;
 
 		/* Found a block suitable for isolating free pages from */
-		isolated = 0;
 
 		/*
 		 * Take care when isolating in last pageblock of a zone which
@@ -1169,9 +1162,6 @@ static void __compact_pgdat(pg_data_t *pgdat, struct compact_control *cc)
 			if (zone_watermark_ok(zone, cc->order,
 						low_wmark_pages(zone), 0, 0))
 				compaction_defer_reset(zone, cc->order, false);
-			/* Currently async compaction is never deferred. */
-			else if (cc->sync)
-				defer_compaction(zone, cc->order);
 		}
 
 		VM_BUG_ON(!list_empty(&cc->freepages));