memory-failure: fix an error of mce_bad_pages statistics

[linux-2.6-block.git] / mm / memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index c6e4dd3e1c08e50a1844f268d655ab12580fabb4..1a9242c533150b247ce5a91020f9797d6f5a86aa 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1419,18 +1419,17 @@ static int soft_offline_huge_page(struct page *page, int flags)
        unsigned long pfn = page_to_pfn(page);
        struct page *hpage = compound_head(page);
 
+       if (PageHWPoison(hpage)) {
+               pr_info("soft offline: %#lx hugepage already poisoned\n", pfn);
+               return -EBUSY;
+       }
+
        ret = get_any_page(page, pfn, flags);
        if (ret < 0)
                return ret;
        if (ret == 0)
                goto done;
 
-       if (PageHWPoison(hpage)) {
-               put_page(hpage);
-               pr_info("soft offline: %#lx hugepage already poisoned\n", pfn);
-               return -EBUSY;
-       }
-
        /* Keep page count to indicate a given hugepage is isolated. */
        ret = migrate_huge_page(hpage, new_page, MPOL_MF_MOVE_ALL, false,
                                MIGRATE_SYNC);
@@ -1441,12 +1440,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
                return ret;
        }
 done:
-       if (!PageHWPoison(hpage))
-               atomic_long_add(1 << compound_trans_order(hpage),
-                               &mce_bad_pages);
+       /* keep elevated page count for bad page */
+       atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
        set_page_hwpoison_huge_page(hpage);
        dequeue_hwpoisoned_huge_page(hpage);
-       /* keep elevated page count for bad page */
+
        return ret;
 }
 
@@ -1488,6 +1486,11 @@ int soft_offline_page(struct page *page, int flags)
                }
        }
 
+       if (PageHWPoison(page)) {
+               pr_info("soft offline: %#lx page already poisoned\n", pfn);
+               return -EBUSY;
+       }
+
        ret = get_any_page(page, pfn, flags);
        if (ret < 0)
                return ret;
@@ -1519,19 +1522,11 @@ int soft_offline_page(struct page *page, int flags)
                return -EIO;
        }
 
-       lock_page(page);
-       wait_on_page_writeback(page);
-
        /*
         * Synchronized using the page lock with memory_failure()
         */
-       if (PageHWPoison(page)) {
-               unlock_page(page);
-               put_page(page);
-               pr_info("soft offline: %#lx page already poisoned\n", pfn);
-               return -EBUSY;
-       }
-
+       lock_page(page);
+       wait_on_page_writeback(page);
        /*
         * Try to invalidate first. This should work for
         * non dirty unmapped page cache pages.
@@ -1583,8 +1578,9 @@ int soft_offline_page(struct page *page, int flags)
                return ret;
 
 done:
+       /* keep elevated page count for bad page */
        atomic_long_add(1, &mce_bad_pages);
        SetPageHWPoison(page);
-       /* keep elevated page count for bad page */
+
        return ret;
 }