1 files changed, 18 insertions, 7 deletions

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 52840adae62a..9a99cfaf0a19 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1591,7 +1591,8 @@ bool mem_cgroup_handle_oom(struct mem_cgroup *mem, gfp_t mask)
  * small, we check MEM_CGROUP_ON_MOVE percpu value and detect there are
  * possibility of race condition. If there is, we take a lock.
  */
-void mem_cgroup_update_file_mapped(struct page *page, int val)
+
+static void mem_cgroup_update_file_stat(struct page *page, int idx, int val)
 {
         struct mem_cgroup *mem;
         struct page_cgroup *pc = lookup_page_cgroup(page);
@@ -1613,13 +1614,18 @@ void mem_cgroup_update_file_mapped(struct page *page, int val)
                 if (!mem || !PageCgroupUsed(pc))
                         goto out;
         }
-        if (val > 0) {
-                this_cpu_inc(mem->stat->count[MEM_CGROUP_STAT_FILE_MAPPED]);
-                SetPageCgroupFileMapped(pc);
-        } else {
-                this_cpu_dec(mem->stat->count[MEM_CGROUP_STAT_FILE_MAPPED]);
-                if (!page_mapped(page)) /* for race between dec->inc counter */
+
+        this_cpu_add(mem->stat->count[idx], val);
+
+        switch (idx) {
+        case MEM_CGROUP_STAT_FILE_MAPPED:
+                if (val > 0)
+                        SetPageCgroupFileMapped(pc);
+                else if (!page_mapped(page))
                         ClearPageCgroupFileMapped(pc);
+                break;
+        default:
+                BUG();
         }
 
 out:
@@ -1629,6 +1635,11 @@ out:
         return;
 }
 
+void mem_cgroup_update_file_mapped(struct page *page, int val)
+{
+        mem_cgroup_update_file_stat(page, MEM_CGROUP_STAT_FILE_MAPPED, val);
+}
+
 /*
  * size of first charge trial. "32" comes from vmscan.c's magic value.
  * TODO: maybe necessary to use big numbers in big irons.