1 files changed, 11 insertions, 1 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 81fb9bff0d4f..b7a01e927953 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -33,6 +33,7 @@
 #include <linux/syscalls.h>
 #include <linux/cpuset.h>
 #include <linux/hardirq.h> /* for BUG_ON(!in_atomic()) only */
+#include <linux/memcontrol.h>
 #include "internal.h"
 
 /*
@@ -118,6 +119,7 @@ void __remove_from_page_cache(struct page *page)
 {
         struct address_space *mapping = page->mapping;
 
+        mem_cgroup_uncharge_page(page);
         radix_tree_delete(&mapping->page_tree, page->index);
         page->mapping = NULL;
         mapping->nrpages--;
@@ -461,6 +463,11 @@ int add_to_page_cache(struct page *page, struct address_space *mapping,
         int error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM);
 
         if (error == 0) {
+
+                error = mem_cgroup_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) {
@@ -470,10 +477,13 @@ int add_to_page_cache(struct page *page, struct address_space *mapping,
                         page->index = offset;
                         mapping->nrpages++;
                         __inc_zone_page_state(page, NR_FILE_PAGES);
-                }
+                } else
+                        mem_cgroup_uncharge_page(page);
+
                 write_unlock_irq(&mapping->tree_lock);
                 radix_tree_preload_end();
         }
+out:
         return error;
 }
 EXPORT_SYMBOL(add_to_page_cache);