1 files changed, 28 insertions, 53 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index be26d5cbe56..77ed2d77370 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -33,6 +33,7 @@
 #include <linux/memcontrol.h>
 #include <linux/syscalls.h>
 #include <linux/hugetlb.h>
+#include <linux/hugetlb_cgroup.h>
 #include <linux/gfp.h>
 
 #include <asm/tlbflush.h>
@@ -682,7 +683,6 @@ static int __unmap_and_move(struct page *page, struct page *newpage,
 {
         int rc = -EAGAIN;
         int remap_swapcache = 1;
-        int charge = 0;
         struct mem_cgroup *mem;
         struct anon_vma *anon_vma = NULL;
 
@@ -724,12 +724,7 @@ static int __unmap_and_move(struct page *page, struct page *newpage,
         }
 
         /* charge against new page */
-        charge = mem_cgroup_prepare_migration(page, newpage, &mem, GFP_KERNEL);
-        if (charge == -ENOMEM) {
-                rc = -ENOMEM;
-                goto unlock;
-        }
-        BUG_ON(charge);
+        mem_cgroup_prepare_migration(page, newpage, &mem);
 
         if (PageWriteback(page)) {
                 /*
@@ -819,8 +814,7 @@ skip_unmap:
                 put_anon_vma(anon_vma);
 
 uncharge:
-        if (!charge)
-                mem_cgroup_end_migration(mem, page, newpage, rc == 0);
+        mem_cgroup_end_migration(mem, page, newpage, rc == 0);
 unlock:
         unlock_page(page);
 out:
@@ -931,16 +925,13 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,
 
         if (anon_vma)
                 put_anon_vma(anon_vma);
-        unlock_page(hpage);
 
-out:
-        if (rc != -EAGAIN) {
-                list_del(&hpage->lru);
-                put_page(hpage);
-        }
+        if (!rc)
+                hugetlb_cgroup_migrate(hpage, new_hpage);
 
+        unlock_page(hpage);
+out:
         put_page(new_hpage);
-
         if (result) {
                 if (rc)
                         *result = rc;
@@ -1016,48 +1007,32 @@ out:
         return nr_failed + retry;
 }
 
-int migrate_huge_pages(struct list_head *from,
-                new_page_t get_new_page, unsigned long private, bool offlining,
-                enum migrate_mode mode)
+int migrate_huge_page(struct page *hpage, new_page_t get_new_page,
+                      unsigned long private, bool offlining,
+                      enum migrate_mode mode)
 {
-        int retry = 1;
-        int nr_failed = 0;
-        int pass = 0;
-        struct page *page;
-        struct page *page2;
-        int rc;
-
-        for (pass = 0; pass < 10 && retry; pass++) {
-                retry = 0;
-
-                list_for_each_entry_safe(page, page2, from, lru) {
+        int pass, rc;
+
+        for (pass = 0; pass < 10; pass++) {
+                rc = unmap_and_move_huge_page(get_new_page,
+                                              private, hpage, pass > 2, offlining,
+                                              mode);
+                switch (rc) {
+                case -ENOMEM:
+                        goto out;
+                case -EAGAIN:
+                        /* try again */
                         cond_resched();
-
-                        rc = unmap_and_move_huge_page(get_new_page,
-                                        private, page, pass > 2, offlining,
-                                        mode);
-
-                        switch(rc) {
-                        case -ENOMEM:
-                                goto out;
-                        case -EAGAIN:
-                                retry++;
-                                break;
-                        case 0:
-                                break;
-                        default:
-                                /* Permanent failure */
-                                nr_failed++;
-                                break;
-                        }
+                        break;
+                case 0:
+                        goto out;
+                default:
+                        rc = -EIO;
+                        goto out;
                 }
         }
-        rc = 0;
 out:
-        if (rc)
-                return rc;
-
-        return nr_failed + retry;
+        return rc;
 }
 
 #ifdef CONFIG_NUMA