Commit ab215884 authored by Wanpeng Li's avatar Wanpeng Li Committed by Linus Torvalds

memcg: rename mem_control_xxx to memcg_xxx

Replace memory_cgroup_xxx() with memcg_xxx()
Signed-off-by: default avatarWanpeng Li <liwp.linux@gmail.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 567fb435
...@@ -4006,7 +4006,7 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp, ...@@ -4006,7 +4006,7 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp,
#endif #endif
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
static int mem_control_numa_stat_show(struct cgroup *cont, struct cftype *cft, static int memcg_numa_stat_show(struct cgroup *cont, struct cftype *cft,
struct seq_file *m) struct seq_file *m)
{ {
int nid; int nid;
...@@ -4065,7 +4065,7 @@ static inline void mem_cgroup_lru_names_not_uptodate(void) ...@@ -4065,7 +4065,7 @@ static inline void mem_cgroup_lru_names_not_uptodate(void)
BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS); BUILD_BUG_ON(ARRAY_SIZE(mem_cgroup_lru_names) != NR_LRU_LISTS);
} }
static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft, static int memcg_stat_show(struct cgroup *cont, struct cftype *cft,
struct seq_file *m) struct seq_file *m)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
...@@ -4579,7 +4579,7 @@ static struct cftype mem_cgroup_files[] = { ...@@ -4579,7 +4579,7 @@ static struct cftype mem_cgroup_files[] = {
}, },
{ {
.name = "stat", .name = "stat",
.read_seq_string = mem_control_stat_show, .read_seq_string = memcg_stat_show,
}, },
{ {
.name = "force_empty", .name = "force_empty",
...@@ -4611,7 +4611,7 @@ static struct cftype mem_cgroup_files[] = { ...@@ -4611,7 +4611,7 @@ static struct cftype mem_cgroup_files[] = {
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
{ {
.name = "numa_stat", .name = "numa_stat",
.read_seq_string = mem_control_numa_stat_show, .read_seq_string = memcg_numa_stat_show,
}, },
#endif #endif
#ifdef CONFIG_MEMCG_SWAP #ifdef CONFIG_MEMCG_SWAP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment