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>

1 files changed, 5 insertions, 5 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 33df0583edb9..777711203809 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -2427,7 +2427,7 @@ void account_page_dirtied(struct page *page, struct address_space *mapping)
                 inode_attach_wb(inode, page);
                 wb = inode_to_wb(inode);
 
-                mem_cgroup_inc_page_stat(page, MEM_CGROUP_STAT_DIRTY);
+                mem_cgroup_inc_page_stat(page, NR_FILE_DIRTY);
                 __inc_node_page_state(page, NR_FILE_DIRTY);
                 __inc_zone_page_state(page, NR_ZONE_WRITE_PENDING);
                 __inc_node_page_state(page, NR_DIRTIED);
@@ -2449,7 +2449,7 @@ void account_page_cleaned(struct page *page, struct address_space *mapping,
                           struct bdi_writeback *wb)
 {
         if (mapping_cap_account_dirty(mapping)) {
-                mem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_DIRTY);
+                mem_cgroup_dec_page_stat(page, NR_FILE_DIRTY);
                 dec_node_page_state(page, NR_FILE_DIRTY);
                 dec_zone_page_state(page, NR_ZONE_WRITE_PENDING);
                 dec_wb_stat(wb, WB_RECLAIMABLE);
@@ -2706,7 +2706,7 @@ int clear_page_dirty_for_io(struct page *page)
                  */
                 wb = unlocked_inode_to_wb_begin(inode, &locked);
                 if (TestClearPageDirty(page)) {
-                        mem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_DIRTY);
+                        mem_cgroup_dec_page_stat(page, NR_FILE_DIRTY);
                         dec_node_page_state(page, NR_FILE_DIRTY);
                         dec_zone_page_state(page, NR_ZONE_WRITE_PENDING);
                         dec_wb_stat(wb, WB_RECLAIMABLE);
@@ -2753,7 +2753,7 @@ int test_clear_page_writeback(struct page *page)
                 ret = TestClearPageWriteback(page);
         }
         if (ret) {
-                mem_cgroup_dec_page_stat(page, MEM_CGROUP_STAT_WRITEBACK);
+                mem_cgroup_dec_page_stat(page, NR_WRITEBACK);
                 dec_node_page_state(page, NR_WRITEBACK);
                 dec_zone_page_state(page, NR_ZONE_WRITE_PENDING);
                 inc_node_page_state(page, NR_WRITTEN);
@@ -2808,7 +2808,7 @@ int __test_set_page_writeback(struct page *page, bool keep_write)
                 ret = TestSetPageWriteback(page);
         }
         if (!ret) {
-                mem_cgroup_inc_page_stat(page, MEM_CGROUP_STAT_WRITEBACK);
+                mem_cgroup_inc_page_stat(page, NR_WRITEBACK);
                 inc_node_page_state(page, NR_WRITEBACK);
                 inc_zone_page_state(page, NR_ZONE_WRITE_PENDING);
         }