1 files changed, 5 insertions, 7 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index ed97c2c14fa8..89a0a1707f4c 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -184,9 +184,9 @@ void putback_movable_pages(struct list_head *l)
                         unlock_page(page);
                         put_page(page);
                 } else {
-                        putback_lru_page(page);
                         dec_node_page_state(page, NR_ISOLATED_ANON +
                                         page_is_file_cache(page));
+                        putback_lru_page(page);
                 }
         }
 }
@@ -194,7 +194,7 @@ void putback_movable_pages(struct list_head *l)
 /*
  * Restore a potential migration pte to a working pte entry
  */
-static int remove_migration_pte(struct page *page, struct vm_area_struct *vma,
+static bool remove_migration_pte(struct page *page, struct vm_area_struct *vma,
                                  unsigned long addr, void *old)
 {
         struct page_vma_mapped_walk pvmw = {
@@ -253,7 +253,7 @@ static int remove_migration_pte(struct page *page, struct vm_area_struct *vma,
                 update_mmu_cache(vma, pvmw.address, pvmw.pte);
         }
 
-        return SWAP_AGAIN;
+        return true;
 }
 
 /*
@@ -1722,9 +1722,6 @@ static bool migrate_balanced_pgdat(struct pglist_data *pgdat,
 {
         int z;
 
-        if (!pgdat_reclaimable(pgdat))
-                return false;
-
         for (z = pgdat->nr_zones - 1; z >= 0; z--) {
                 struct zone *zone = pgdat->node_zones + z;
 
@@ -1947,7 +1944,8 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
 
         /* Prepare a page as a migration target */
         __SetPageLocked(new_page);
-        __SetPageSwapBacked(new_page);
+        if (PageSwapBacked(page))
+                __SetPageSwapBacked(new_page);
 
         /* anon mapping, we can simply copy page->mapping to the new page: */
         new_page->mapping = page->mapping;