memcg: make page->mapping NULL before uncharge

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

diff --git a/mm/filemap.c b/mm/filemap.c
index e1b23fda48de62d134d3143006a64d2525816b60..ab8553658af3fb2fcfac7b0c80bc2ed8d1343721 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -116,12 +116,12 @@ void __remove_from_page_cache(struct page *page)
 {
        struct address_space *mapping = page->mapping;
 
-       mem_cgroup_uncharge_cache_page(page);
        radix_tree_delete(&mapping->page_tree, page->index);
        page->mapping = NULL;
        mapping->nrpages--;
        __dec_zone_page_state(page, NR_FILE_PAGES);
        BUG_ON(page_mapped(page));
+       mem_cgroup_uncharge_cache_page(page);
 
        /*
         * Some filesystems seem to re-dirty the page even after