1 files changed, 1 insertions, 3 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 349a40e35545..f501b56ec2c6 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -234,7 +234,6 @@ void delete_from_page_cache(struct page *page)
         spin_lock_irq(&mapping->tree_lock);
         __delete_from_page_cache(page, NULL);
         spin_unlock_irq(&mapping->tree_lock);
-        mem_cgroup_uncharge_cache_page(page);
 
         if (freepage)
                 freepage(page);
@@ -490,8 +489,7 @@ int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask)
                 if (PageSwapBacked(new))
                         __inc_zone_page_state(new, NR_SHMEM);
                 spin_unlock_irq(&mapping->tree_lock);
-                /* mem_cgroup codes must not be called under tree_lock */
-                mem_cgroup_replace_page_cache(old, new);
+                mem_cgroup_migrate(old, new, true);
                 radix_tree_preload_end();
                 if (freepage)
                         freepage(old);