summaryrefslogtreecommitdiffstats
path: root/mm/rmap.c
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2017-05-03 17:55:13 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-03 18:52:11 -0400
commit71cd31135d4cf030a057ed7079a75a40c0a4a796 (patch)
treec95c8da1e70c21e412d9ab7328fc414ecfb80451 /mm/rmap.c
parentdf0e53d0619e83b465e363c088bf4eeb2848273b (diff)
mm: memcontrol: re-use node VM page state enum
The current duplication is a high-maintenance mess, and it's painful to add new items or query memcg state from the rest of the VM. This increases the size of the stat array marginally, but we should aim to track all these stats on a per-cgroup level anyway. Link: http://lkml.kernel.org/r/20170404220148.28338-3-hannes@cmpxchg.org Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Vladimir Davydov <vdavydov.dev@gmail.com> Cc: Michal Hocko <mhocko@suse.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/rmap.c')
-rw-r--r--mm/rmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/rmap.c b/mm/rmap.c
index e303fdbee561..a6d018c4a13a 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1158,7 +1158,7 @@ void page_add_file_rmap(struct page *page, bool compound)
1158 goto out; 1158 goto out;
1159 } 1159 }
1160 __mod_node_page_state(page_pgdat(page), NR_FILE_MAPPED, nr); 1160 __mod_node_page_state(page_pgdat(page), NR_FILE_MAPPED, nr);
1161 mem_cgroup_update_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED, nr); 1161 mem_cgroup_update_page_stat(page, NR_FILE_MAPPED, nr);
1162out: 1162out:
1163 unlock_page_memcg(page); 1163 unlock_page_memcg(page);
1164} 1164}
@@ -1198,7 +1198,7 @@ static void page_remove_file_rmap(struct page *page, bool compound)
1198 * pte lock(a spinlock) is held, which implies preemption disabled. 1198 * pte lock(a spinlock) is held, which implies preemption disabled.
1199 */ 1199 */
1200 __mod_node_page_state(page_pgdat(page), NR_FILE_MAPPED, -nr); 1200 __mod_node_page_state(page_pgdat(page), NR_FILE_MAPPED, -nr);
1201 mem_cgroup_update_page_stat(page, MEM_CGROUP_STAT_FILE_MAPPED, -nr); 1201 mem_cgroup_update_page_stat(page, NR_FILE_MAPPED, -nr);
1202 1202
1203 if (unlikely(PageMlocked(page))) 1203 if (unlikely(PageMlocked(page)))
1204 clear_page_mlock(page); 1204 clear_page_mlock(page);