memcg: unify mem_control_xxx to memcg_xxx
Subsystems (3)
PATCH v2 1/1 memcg: unify mem_control_xxx to memcg_xxx
From: Wanpeng Li <[email protected]>
Changelog:
V2 -> V1:
* replace memory_cgroup_xxx by memcg_xxx
Unify memcg functions to memcg_xxx.
--- mm/memcontrol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/memcontrol.c +4 -4
@@ -3999,7 +3999,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;
@@ -4058,7 +4058,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);
@@ -4572,7 +4572,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",
@@ -4604,7 +4604,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_CGROUP_MEM_RES_CTLR_SWAP
Signature · 1 line
1.7.9.5
Quoted 9 lines · Wanpeng Li
From: Wanpeng Li <[email protected]>
Changelog:
V2 -> V1:
* replace
memory_cgroup_xxxbymemcg_xxxUnify memcg functions to
memcg_xxx.
This patch achieves nothing.
You're changing a couple of function names. Andrew stated goal was to change *all* function names from mem_cgroup_xxx to memcg_xxx, not just one or two.
This can be done mechanically by replacing occurrences of mem_cgroup_xxx with memcg_xxx, and verifying that your final result is correct by compiling the kernel with and without the combination of config options that matters here, plus a set of randconfigs - or anything like that.
Make sure you have Andrew's latest patch in your tree, that converts the config option names.
Quoted 9 lines · Glauber Costa
Quoted 8 lines · Wanpeng Li
From: Wanpeng Li <[email protected]>
Changelog:
V2 -> V1:
* replace
memory_cgroup_xxxbymemcg_xxx
Quoted 7 lines
Quoted 1 line
Unify memcg functions to
memcg_xxx.This patch achieves nothing.
You're changing a couple of function names. Andrew stated goal was to change *all* function names frommem_cgroup_xxxtomemcg_xxx, not just one or two.
No mass things now, please.
git grep mem_cgroup_ mm/ include/ | wc -l
863
This will be real pain for merging.
Signature · 6 lines
Michal Hocko SUSE Labs SUSE LINUX s.r.o. Lihovarska 1060/12 190 00 Praha 9 Czech Republic
Quoted 18 lines · Michal Hocko
Quoted 9 lines · Glauber Costa
Quoted 8 lines · Wanpeng Li
From: Wanpeng Li <[email protected]>
Changelog:
V2 -> V1:
* replace
memory_cgroup_xxxbymemcg_xxxQuoted 7 lines
Quoted 1 line
Unify memcg functions to
memcg_xxx.This patch achieves nothing.
You're changing a couple of function names. Andrew stated goal was to change *all* function names frommem_cgroup_xxxtomemcg_xxx, not just one or two.
Quoted 6 lines
No mass things now, please.
git grepmem_cgroup_mm/include/| wc -l
863This will be real pain for merging.
It's either that, or I have my new functions named memcg_ and we live with the inconsistency.
Point is, changing one function name as he did, achieves nothing.