Merge tag 'devicetree-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[firefly-linux-kernel-4.4.55.git] / mm / memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 5fd8931d8c31c09e0c2bc666f641d19fd38fda7c..d9359b770cd96b37ee945553a4230edbfd720e46 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1586,8 +1586,18 @@ static int soft_offline_huge_page(struct page *page, int flags)
        }
        unlock_page(hpage);
 
-       /* Keep page count to indicate a given hugepage is isolated. */
-       list_move(&hpage->lru, &pagelist);
+       ret = isolate_huge_page(hpage, &pagelist);
+       if (ret) {
+               /*
+                * get_any_page() and isolate_huge_page() takes a refcount each,
+                * so need to drop one here.
+                */
+               put_page(hpage);
+       } else {
+               pr_info("soft offline: %#lx hugepage failed to isolate\n", pfn);
+               return -EBUSY;
+       }
+
        ret = migrate_pages(&pagelist, new_page, NULL, MPOL_MF_MOVE_ALL,
                                MIGRATE_SYNC, MR_MEMORY_FAILURE);
        if (ret) {