memcg: make page->mapping NULL before uncharge

[linux-2.6-omap-h63xx.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index 11c6c56ec017e672fd058c0179a4c09ef8de291e..6602941bfab0b03607f9bce6dd8e3f9ce1046bfe 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -330,8 +330,6 @@ static int migrate_page_move_mapping(struct address_space *mapping,
        __inc_zone_page_state(newpage, NR_FILE_PAGES);
 
        spin_unlock_irq(&mapping->tree_lock);
-       if (!PageSwapCache(newpage))
-               mem_cgroup_uncharge_cache_page(page);
 
        return 0;
 }
@@ -341,6 +339,8 @@ static int migrate_page_move_mapping(struct address_space *mapping,
  */
 static void migrate_page_copy(struct page *newpage, struct page *page)
 {
+       int anon;
+
        copy_highpage(newpage, page);
 
        if (PageError(page))
@@ -378,8 +378,13 @@ static void migrate_page_copy(struct page *newpage, struct page *page)
 #endif
        ClearPagePrivate(page);
        set_page_private(page, 0);
+       /* page->mapping contains a flag for PageAnon() */
+       anon = PageAnon(page);
        page->mapping = NULL;
 
+       if (!anon) /* This page was removed from radix-tree. */
+               mem_cgroup_uncharge_cache_page(page);
+
        /*
         * If any waiters have accumulated on the new page then
         * wake them up.