3 files changed, 14 insertions, 34 deletions

diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index a405d3dc0f61..6fe521420631 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -41,8 +41,6 @@ extern int migrate_page(struct address_space *,
                         struct page *, struct page *, enum migrate_mode);
 extern int migrate_pages(struct list_head *l, new_page_t x,
                 unsigned long private, enum migrate_mode mode, int reason);
-extern int migrate_huge_page(struct page *, new_page_t x,
-                unsigned long private, enum migrate_mode mode);
 
 extern int fail_migrate_page(struct address_space *,
                         struct page *, struct page *);
@@ -62,9 +60,6 @@ static inline void putback_movable_pages(struct list_head *l) {}
 static inline int migrate_pages(struct list_head *l, new_page_t x,
                 unsigned long private, enum migrate_mode mode, int reason)
         { return -ENOSYS; }
-static inline int migrate_huge_page(struct page *page, new_page_t x,
-                unsigned long private, enum migrate_mode mode)
-        { return -ENOSYS; }
 
 static inline int migrate_prep(void) { return -ENOSYS; }
 static inline int migrate_prep_local(void) { return -ENOSYS; }
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index d84c5e5331bb..e05ed31c0f61 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1470,6 +1470,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
         int ret;
         unsigned long pfn = page_to_pfn(page);
         struct page *hpage = compound_head(page);
+        LIST_HEAD(pagelist);
 
         /*
          * This double-check of PageHWPoison is to avoid the race with
@@ -1485,12 +1486,20 @@ static int soft_offline_huge_page(struct page *page, int flags)
         unlock_page(hpage);
 
         /* Keep page count to indicate a given hugepage is isolated. */
-        ret = migrate_huge_page(hpage, new_page, MPOL_MF_MOVE_ALL,
-                                MIGRATE_SYNC);
-        put_page(hpage);
+        list_move(&hpage->lru, &pagelist);
+        ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL,
+                                MIGRATE_SYNC, MR_MEMORY_FAILURE);
         if (ret) {
                 pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
                         pfn, ret, page->flags);
+                /*
+                 * We know that soft_offline_huge_page() tries to migrate
+                 * only one hugepage pointed to by hpage, so we need not
+                 * run through the pagelist here.
+                 */
+                putback_active_hugepage(hpage);
+                if (ret > 0)
+                        ret = -EIO;
         } else {
                 set_page_hwpoison_huge_page(hpage);
                 dequeue_hwpoisoned_huge_page(hpage);
diff --git a/mm/migrate.c b/mm/migrate.c
index b44a067fee10..3ec47d3394c8 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -979,6 +979,8 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,
 
         unlock_page(hpage);
 out:
+        if (rc != -EAGAIN)
+                putback_active_hugepage(hpage);
         put_page(new_hpage);
         if (result) {
                 if (rc)
@@ -1066,32 +1068,6 @@ out:
         return rc;
 }
 
-int migrate_huge_page(struct page *hpage, new_page_t get_new_page,
-                      unsigned long private, enum migrate_mode mode)
-{
-        int pass, rc;
-
-        for (pass = 0; pass < 10; pass++) {
-                rc = unmap_and_move_huge_page(get_new_page, private,
-                                                hpage, pass > 2, mode);
-                switch (rc) {
-                case -ENOMEM:
-                        goto out;
-                case -EAGAIN:
-                        /* try again */
-                        cond_resched();
-                        break;
-                case MIGRATEPAGE_SUCCESS:
-                        goto out;
-                default:
-                        rc = -EIO;
-                        goto out;
-                }
-        }
-out:
-        return rc;
-}
-
 #ifdef CONFIG_NUMA
 /*
  * Move a list of individual pages