2012-06-25 11:16:10

by Wanpeng Li

Subject: [PATCH v4 2/2] memcg: change mem_control_xxx to mem_cgroup_xxx

From: Wanpeng Li <[email protected]>

Unify memcg functions to mem_cgroup_xxx.

Signed-off-by: Wanpeng Li <[email protected]>
Acked-by: Johannes Weiner <[email protected]>
Acked-by: Michal Hocko <[email protected]>
Acked-by: KAMEZAWA Hiroyuki <[email protected]>
---
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 mem_cgroup_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 mem_cgroup_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 = mem_cgroup_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 = mem_cgroup_numa_stat_show,
},
#endif
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
--
1.7.9.5

2012-06-26 19:54:41

by Andrew Morton

Subject: Re: [PATCH v4 2/2] memcg: change mem_control_xxx to mem_cgroup_xxx

On Mon, 25 Jun 2012 19:15:59 +0800
Wanpeng Li <[email protected]> wrote:

> From: Wanpeng Li <[email protected]>
>
> Unify memcg functions to mem_cgroup_xxx.

How about we unify memcg functions to memcg_xxx?

> --- 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 mem_cgroup_numa_stat_show(struct cgroup *cont, struct cftype *cft,
> struct seq_file *m)

memcg_numa_stat_show(), etc.

2012-06-27 00:13:06

by Wanpeng Li

Subject: Re: [PATCH v4 2/2] memcg: change mem_control_xxx to mem_cgroup_xxx

On Tue, Jun 26, 2012 at 12:54:37PM -0700, Andrew Morton wrote:
>On Mon, 25 Jun 2012 19:15:59 +0800
>Wanpeng Li <[email protected]> wrote:
>
>> From: Wanpeng Li <[email protected]>
>>
>> Unify memcg functions to mem_cgroup_xxx.
>
>How about we unify memcg functions to memcg_xxx?

OK, I will resend the patch. Thank you!

Regards,
Wanpeng Li

>
>> --- 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 mem_cgroup_numa_stat_show(struct cgroup *cont, struct cftype *cft,
>> struct seq_file *m)
>
>memcg_numa_stat_show(), etc.
>
>