mem-controller gfp-mask fix

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

diff --git a/mm/filemap.c b/mm/filemap.c
index 8ae171cc281137bbeb5a4a46bf336d7973816157..5357fcc4643b5a653c82d849690ababaeaec9a0e 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -460,14 +460,13 @@ int filemap_write_and_wait_range(struct address_space *mapping,
 int add_to_page_cache(struct page *page, struct address_space *mapping,
                pgoff_t offset, gfp_t gfp_mask)
 {
-       int error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM);
+       int error = mem_cgroup_cache_charge(page, current->mm,
+                                       gfp_mask & ~__GFP_HIGHMEM);
+       if (error)
+               goto out;
 
+       error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM);
        if (error == 0) {
-
-               error = mem_cgroup_cache_charge(page, current->mm);
-               if (error)
-                       goto out;
-
                write_lock_irq(&mapping->tree_lock);
                error = radix_tree_insert(&mapping->page_tree, offset, page);
                if (!error) {
@@ -482,7 +481,8 @@ int add_to_page_cache(struct page *page, struct address_space *mapping,
 
                write_unlock_irq(&mapping->tree_lock);
                radix_tree_preload_end();
-       }
+       } else
+               mem_cgroup_uncharge_page(page);
 out:
        return error;
 }