1 files changed, 2 insertions, 6 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index 1f1a8085538b..6dc80d298f9d 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -419,7 +419,6 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
                         pvec.pages, indices);
                 if (!pvec.nr)
                         break;
-                mem_cgroup_uncharge_start();
                 for (i = 0; i < pagevec_count(&pvec); i++) {
                         struct page *page = pvec.pages[i];
 
@@ -447,7 +446,6 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
                 }
                 pagevec_remove_exceptionals(&pvec);
                 pagevec_release(&pvec);
-                mem_cgroup_uncharge_end();
                 cond_resched();
                 index++;
         }
@@ -495,7 +493,6 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
                         index = start;
                         continue;
                 }
-                mem_cgroup_uncharge_start();
                 for (i = 0; i < pagevec_count(&pvec); i++) {
                         struct page *page = pvec.pages[i];
 
@@ -531,7 +528,6 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
                 }
                 pagevec_remove_exceptionals(&pvec);
                 pagevec_release(&pvec);
-                mem_cgroup_uncharge_end();
                 index++;
         }
 
@@ -835,7 +831,7 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
         }
 
         mutex_unlock(&shmem_swaplist_mutex);
-        swapcache_free(swap, NULL);
+        swapcache_free(swap);
 redirty:
         set_page_dirty(page);
         if (wbc->for_reclaim)
@@ -1008,7 +1004,7 @@ static int shmem_replace_page(struct page **pagep, gfp_t gfp,
                  */
                 oldpage = newpage;
         } else {
-                mem_cgroup_replace_page_cache(oldpage, newpage);
+                mem_cgroup_migrate(oldpage, newpage, false);
                 lru_cache_add_anon(newpage);
                 *pagep = newpage;
         }