Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41326c17 authored by Kamezawa Hiroyuki's avatar Kamezawa Hiroyuki Committed by Linus Torvalds
Browse files

memcg: rename MEM_CGROUP_CHARGE_TYPE_MAPPED as MEM_CGROUP_CHARGE_TYPE_ANON 



Now, in memcg, 2 "MAPPED" enum/macro are found
 MEM_CGROUP_CHARGE_TYPE_MAPPED
 MEM_CGROUP_STAT_FILE_MAPPED

Thier names looks similar to each other but the former is used for
accounting anonymous memory. rename it as TYPE_ANON.

Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bff6bb83

mm/memcontrol.c

+8 −8
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static bool move_file(void) 


enum charge_type {

	MEM_CGROUP_CHARGE_TYPE_CACHE = 0,

	MEM_CGROUP_CHARGE_TYPE_MAPPED,

	MEM_CGROUP_CHARGE_TYPE_ANON,

	MEM_CGROUP_CHARGE_TYPE_SHMEM,	/* used by page migration of shmem */

	MEM_CGROUP_CHARGE_TYPE_FORCE,	/* used by force_empty */

	MEM_CGROUP_CHARGE_TYPE_SWAPOUT,	/* for accounting swapcache */
@@ -2519,7 +2519,7 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *memcg, 
		spin_unlock_irq(&zone->lru_lock);

	}



	if (ctype == MEM_CGROUP_CHARGE_TYPE_MAPPED)

	if (ctype == MEM_CGROUP_CHARGE_TYPE_ANON)

		anon = true;

	else

		anon = false;
@@ -2728,7 +2728,7 @@ int mem_cgroup_newpage_charge(struct page *page, 
	VM_BUG_ON(page->mapping && !PageAnon(page));

	VM_BUG_ON(!mm);

	return mem_cgroup_charge_common(page, mm, gfp_mask,

					MEM_CGROUP_CHARGE_TYPE_MAPPED);

					MEM_CGROUP_CHARGE_TYPE_ANON);

}



static void
@@ -2842,7 +2842,7 @@ void mem_cgroup_commit_charge_swapin(struct page *page, 
				     struct mem_cgroup *memcg)

{

	__mem_cgroup_commit_charge_swapin(page, memcg,

					  MEM_CGROUP_CHARGE_TYPE_MAPPED);

					  MEM_CGROUP_CHARGE_TYPE_ANON);

}



void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg)
@@ -2945,7 +2945,7 @@ __mem_cgroup_uncharge_common(struct page *page, enum charge_type ctype) 
	anon = PageAnon(page);



	switch (ctype) {

	case MEM_CGROUP_CHARGE_TYPE_MAPPED:

	case MEM_CGROUP_CHARGE_TYPE_ANON:

		/*

		 * Generally PageAnon tells if it's the anon statistics to be

		 * updated; but sometimes e.g. mem_cgroup_uncharge_page() is
@@ -3005,7 +3005,7 @@ void mem_cgroup_uncharge_page(struct page *page) 
	if (page_mapped(page))

		return;

	VM_BUG_ON(page->mapping && !PageAnon(page));

	__mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_MAPPED);

	__mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_ANON);

}



void mem_cgroup_uncharge_cache_page(struct page *page)
@@ -3248,7 +3248,7 @@ int mem_cgroup_prepare_migration(struct page *page, 
	 * mapcount will be finally 0 and we call uncharge in end_migration().

	 */

	if (PageAnon(page))

		ctype = MEM_CGROUP_CHARGE_TYPE_MAPPED;

		ctype = MEM_CGROUP_CHARGE_TYPE_ANON;

	else if (page_is_file_cache(page))

		ctype = MEM_CGROUP_CHARGE_TYPE_CACHE;

	else
@@ -3287,7 +3287,7 @@ void mem_cgroup_end_migration(struct mem_cgroup *memcg, 
	unlock_page_cgroup(pc);

	anon = PageAnon(used);

	__mem_cgroup_uncharge_common(unused,

		anon ? MEM_CGROUP_CHARGE_TYPE_MAPPED

		anon ? MEM_CGROUP_CHARGE_TYPE_ANON

		     : MEM_CGROUP_CHARGE_TYPE_CACHE);



	/*