>From d258ed6571b779caed871f47a26016cc25c0ed92 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Date: Thu, 15 Dec 2011 11:51:17 +0900 Subject: [PATCH 3/5] memcg: remove PCG_FILE_MAPPED Now, updating page stats (for memcg) and moving account is mutually executed and we don't need FILE_MAPPED flag. We can see page's status itself. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> --- include/linux/page_cgroup.h | 5 ----- mm/memcontrol.c | 6 +----- 2 files changed, 1 insertions(+), 10 deletions(-) diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h index 2cddacf..e4cb1bf 100644 --- a/include/linux/page_cgroup.h +++ b/include/linux/page_cgroup.h @@ -9,7 +9,6 @@ enum { PCG_MIGRATION, /* under page migration */ /* flags for mem_cgroup and file and I/O status */ PCG_MOVE_LOCK, /* For race between move_account v.s. following bits */ - PCG_FILE_MAPPED, /* page is accounted as "mapped" */ __NR_PCG_FLAGS, }; @@ -73,10 +72,6 @@ TESTPCGFLAG(Used, USED) CLEARPCGFLAG(Used, USED) SETPCGFLAG(Used, USED) -SETPCGFLAG(FileMapped, FILE_MAPPED) -CLEARPCGFLAG(FileMapped, FILE_MAPPED) -TESTPCGFLAG(FileMapped, FILE_MAPPED) - SETPCGFLAG(Migration, MIGRATION) CLEARPCGFLAG(Migration, MIGRATION) TESTPCGFLAG(Migration, MIGRATION) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f4e6d5c..907359c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1878,10 +1878,6 @@ void __mem_cgroup_update_page_stat(struct page *page, switch (idx) { case MEMCG_NR_FILE_MAPPED: - if (val > 0) - SetPageCgroupFileMapped(pc); - else if (!page_mapped(page)) - ClearPageCgroupFileMapped(pc); idx = MEM_CGROUP_STAT_FILE_MAPPED; break; default: @@ -2499,7 +2495,7 @@ static int mem_cgroup_move_account(struct page *page, move_lock_page_cgroup(pc, &flags); - if (PageCgroupFileMapped(pc)) { + if (page_mapped(page) && !PageAnon(page)) { /* Update mapped_file data for mem_cgroup */ preempt_disable(); __this_cpu_dec(from->stat->count[MEM_CGROUP_STAT_FILE_MAPPED]); -- 1.7.4.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>