* [PATCH v2] memcg: unify mem_control_xxx to memcg_xxx
@ 2012-06-27 0:16 ` Wanpeng Li
0 siblings, 0 replies; 8+ messages in thread
From: Wanpeng Li @ 2012-06-27 0:16 UTC (permalink / raw)
To: Andrew Morton
Cc: Michal Hocko, Johannes Weiner, KAMEZAWA Hiroyuki, Balbir Singh,
linux-kernel, cgroups, Wanpeng Li
From: Wanpeng Li <liwp@linux.vnet.ibm.com>
Changelog:
V2 -> V1:
* replace memory_cgroup_xxx by memcg_xxx
Unify memcg functions to 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>
---
mm/memcontrol.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index ccda728..2e81328 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2] memcg: unify mem_control_xxx to memcg_xxx
@ 2012-06-27 0:16 ` Wanpeng Li
0 siblings, 0 replies; 8+ messages in thread
From: Wanpeng Li @ 2012-06-27 0:16 UTC (permalink / raw)
To: Andrew Morton
Cc: Michal Hocko, Johannes Weiner, KAMEZAWA Hiroyuki, Balbir Singh,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cgroups-u79uwXL29TY76Z2rM5mHXA, Wanpeng Li
From: Wanpeng Li <liwp-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
Changelog:
V2 -> V1:
* replace memory_cgroup_xxx by memcg_xxx
Unify memcg functions to memcg_xxx.
Signed-off-by: Wanpeng Li <liwp.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>
Acked-by: Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org>
---
mm/memcontrol.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index ccda728..2e81328 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2] memcg: unify mem_control_xxx to memcg_xxx
@ 2012-06-27 8:43 ` Glauber Costa
0 siblings, 0 replies; 8+ messages in thread
From: Glauber Costa @ 2012-06-27 8:43 UTC (permalink / raw)
To: Wanpeng Li
Cc: Andrew Morton, Michal Hocko, Johannes Weiner, KAMEZAWA Hiroyuki,
Balbir Singh, linux-kernel, cgroups
On 06/27/2012 04:16 AM, Wanpeng Li wrote:
> From: Wanpeng Li <liwp@linux.vnet.ibm.com>
>
> Changelog:
>
> V2 -> V1:
>
> * replace memory_cgroup_xxx by memcg_xxx
>
> 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 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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] memcg: unify mem_control_xxx to memcg_xxx
@ 2012-06-27 8:43 ` Glauber Costa
0 siblings, 0 replies; 8+ messages in thread
From: Glauber Costa @ 2012-06-27 8:43 UTC (permalink / raw)
To: Wanpeng Li
Cc: Andrew Morton, Michal Hocko, Johannes Weiner, KAMEZAWA Hiroyuki,
Balbir Singh, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cgroups-u79uwXL29TY76Z2rM5mHXA
On 06/27/2012 04:16 AM, Wanpeng Li wrote:
> From: Wanpeng Li <liwp-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
>
> Changelog:
>
> V2 -> V1:
>
> * replace memory_cgroup_xxx by memcg_xxx
>
> 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 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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] memcg: unify mem_control_xxx to memcg_xxx
@ 2012-06-27 8:59 ` Michal Hocko
0 siblings, 0 replies; 8+ messages in thread
From: Michal Hocko @ 2012-06-27 8:59 UTC (permalink / raw)
To: Glauber Costa
Cc: Wanpeng Li, Andrew Morton, Johannes Weiner, KAMEZAWA Hiroyuki,
Balbir Singh, linux-kernel, cgroups
On Wed 27-06-12 12:43:50, Glauber Costa wrote:
> On 06/27/2012 04:16 AM, Wanpeng Li wrote:
> >From: Wanpeng Li <liwp@linux.vnet.ibm.com>
> >
> >Changelog:
> >
> >V2 -> V1:
> >
> >* replace memory_cgroup_xxx by memcg_xxx
> >
> >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 from mem_cgroup_xxx to memcg_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.
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] memcg: unify mem_control_xxx to memcg_xxx
@ 2012-06-27 8:59 ` Michal Hocko
0 siblings, 0 replies; 8+ messages in thread
From: Michal Hocko @ 2012-06-27 8:59 UTC (permalink / raw)
To: Glauber Costa
Cc: Wanpeng Li, Andrew Morton, Johannes Weiner, KAMEZAWA Hiroyuki,
Balbir Singh, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cgroups-u79uwXL29TY76Z2rM5mHXA
On Wed 27-06-12 12:43:50, Glauber Costa wrote:
> On 06/27/2012 04:16 AM, Wanpeng Li wrote:
> >From: Wanpeng Li <liwp-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
> >
> >Changelog:
> >
> >V2 -> V1:
> >
> >* replace memory_cgroup_xxx by memcg_xxx
> >
> >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 from mem_cgroup_xxx to memcg_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.
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] memcg: unify mem_control_xxx to memcg_xxx
@ 2012-06-27 9:00 ` Glauber Costa
0 siblings, 0 replies; 8+ messages in thread
From: Glauber Costa @ 2012-06-27 9:00 UTC (permalink / raw)
To: Michal Hocko
Cc: Wanpeng Li, Andrew Morton, Johannes Weiner, KAMEZAWA Hiroyuki,
Balbir Singh, linux-kernel, cgroups
On 06/27/2012 12:59 PM, Michal Hocko wrote:
> On Wed 27-06-12 12:43:50, Glauber Costa wrote:
>> On 06/27/2012 04:16 AM, Wanpeng Li wrote:
>>> From: Wanpeng Li <liwp@linux.vnet.ibm.com>
>>>
>>> Changelog:
>>>
>>> V2 -> V1:
>>>
>>> * replace memory_cgroup_xxx by memcg_xxx
>>>
>>> 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 from mem_cgroup_xxx to memcg_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.
>
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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] memcg: unify mem_control_xxx to memcg_xxx
@ 2012-06-27 9:00 ` Glauber Costa
0 siblings, 0 replies; 8+ messages in thread
From: Glauber Costa @ 2012-06-27 9:00 UTC (permalink / raw)
To: Michal Hocko
Cc: Wanpeng Li, Andrew Morton, Johannes Weiner, KAMEZAWA Hiroyuki,
Balbir Singh, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cgroups-u79uwXL29TY76Z2rM5mHXA
On 06/27/2012 12:59 PM, Michal Hocko wrote:
> On Wed 27-06-12 12:43:50, Glauber Costa wrote:
>> On 06/27/2012 04:16 AM, Wanpeng Li wrote:
>>> From: Wanpeng Li <liwp-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
>>>
>>> Changelog:
>>>
>>> V2 -> V1:
>>>
>>> * replace memory_cgroup_xxx by memcg_xxx
>>>
>>> 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 from mem_cgroup_xxx to memcg_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.
>
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.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-06-27 9:03 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-27 0:16 [PATCH v2] memcg: unify mem_control_xxx to memcg_xxx Wanpeng Li
2012-06-27 0:16 ` Wanpeng Li
2012-06-27 8:43 ` Glauber Costa
2012-06-27 8:43 ` Glauber Costa
2012-06-27 8:59 ` Michal Hocko
2012-06-27 8:59 ` Michal Hocko
2012-06-27 9:00 ` Glauber Costa
2012-06-27 9:00 ` Glauber Costa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.