Skip to content

Commit

Permalink
memcg: rename mem_control_xxx to memcg_xxx
Browse files Browse the repository at this point in the history
Replace memory_cgroup_xxx() with memcg_xxx()

Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Wanpeng Li authored and Linus Torvalds committed Aug 1, 2012
1 parent 567fb43 commit ab21588
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mm/memcontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -4006,7 +4006,7 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp,
#endif

#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)
{
int nid;
Expand Down Expand Up @@ -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);
}

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 mem_cgroup *memcg = mem_cgroup_from_cont(cont);
Expand Down Expand Up @@ -4579,7 +4579,7 @@ static struct cftype mem_cgroup_files[] = {
},
{
.name = "stat",
.read_seq_string = mem_control_stat_show,
.read_seq_string = memcg_stat_show,
},
{
.name = "force_empty",
Expand Down Expand Up @@ -4611,7 +4611,7 @@ static struct cftype mem_cgroup_files[] = {
#ifdef CONFIG_NUMA
{
.name = "numa_stat",
.read_seq_string = mem_control_numa_stat_show,
.read_seq_string = memcg_numa_stat_show,
},
#endif
#ifdef CONFIG_MEMCG_SWAP
Expand Down

0 comments on commit ab21588

Please sign in to comment.