1 files changed, 4 insertions, 10 deletions

diff --git a/mm/compaction.c b/mm/compaction.c
index ccf97b02b85f..8fa254043801 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -852,16 +852,8 @@ isolate_migratepages_range(struct compact_control *cc, unsigned long start_pfn,
                 pfn = isolate_migratepages_block(cc, pfn, block_end_pfn,
                                                         ISOLATE_UNEVICTABLE);
 
-                /*
-                 * In case of fatal failure, release everything that might
-                 * have been isolated in the previous iteration, and signal
-                 * the failure back to caller.
-                 */
-                if (!pfn) {
-                        putback_movable_pages(&cc->migratepages);
-                        cc->nr_migratepages = 0;
+                if (!pfn)
                         break;
-                }
 
                 if (cc->nr_migratepages == COMPACT_CLUSTER_MAX)
                         break;
@@ -1741,7 +1733,7 @@ void compaction_unregister_node(struct node *node)
 
 static inline bool kcompactd_work_requested(pg_data_t *pgdat)
 {
-        return pgdat->kcompactd_max_order > 0;
+        return pgdat->kcompactd_max_order > 0 || kthread_should_stop();
 }
 
 static bool kcompactd_node_suitable(pg_data_t *pgdat)
@@ -1805,6 +1797,8 @@ static void kcompactd_do_work(pg_data_t *pgdat)
                 INIT_LIST_HEAD(&cc.freepages);
                 INIT_LIST_HEAD(&cc.migratepages);
 
+                if (kthread_should_stop())
+                        return;
                 status = compact_zone(zone, &cc);
 
                 if (zone_watermark_ok(zone, cc.order, low_wmark_pages(zone),