2012-06-25 08:44:19

by Wanpeng Li

Subject: [PATCH v3 2/4] 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]>
---
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-25 09:43:44

by Michal Hocko

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

On Mon 25-06-12 16:44:08, Wanpeng Li wrote:
> 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]>

Thanks
> ---
> 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
>
> --
> To unsubscribe from this list: send the line "unsubscribe cgroups" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic

2012-06-25 09:57:56

by Kamezawa Hiroyuki

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

(2012/06/25 17:44), Wanpeng Li wrote:
> 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: KAMEZAWA Hiroyuki <[email protected]>