* [PATCH v3 2/4] memcg: change mem_control_xxx to mem_cgroup_xxx
@ 2012-06-25 8:44 ` Wanpeng Li
0 siblings, 0 replies; 6+ messages in thread
From: Wanpeng Li @ 2012-06-25 8:44 UTC (permalink / raw)
To: Michal Hocko
Cc: Johannes Weiner, KAMEZAWA Hiroyuki, Balbir Singh, Andrew Morton,
Eric Dumazet, Mike Frysinger, Arun Sharma,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cgroups-u79uwXL29TY76Z2rM5mHXA, Wanpeng Li
From: Wanpeng Li <liwp-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
Unify memcg functions to mem_cgroup_xxx.
Signed-off-by: Wanpeng Li <liwp.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@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 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/4] memcg: change mem_control_xxx to mem_cgroup_xxx
@ 2012-06-25 8:44 ` Wanpeng Li
0 siblings, 0 replies; 6+ messages in thread
From: Wanpeng Li @ 2012-06-25 8:44 UTC (permalink / raw)
To: Michal Hocko
Cc: Johannes Weiner, KAMEZAWA Hiroyuki, Balbir Singh, Andrew Morton,
Eric Dumazet, Mike Frysinger, Arun Sharma, linux-kernel, cgroups,
Wanpeng Li
From: Wanpeng Li <liwp@linux.vnet.ibm.com>
Unify memcg functions to mem_cgroup_xxx.
Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.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 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/4] memcg: change mem_control_xxx to mem_cgroup_xxx
2012-06-25 8:44 ` Wanpeng Li
@ 2012-06-25 9:43 ` Michal Hocko
-1 siblings, 0 replies; 6+ messages in thread
From: Michal Hocko @ 2012-06-25 9:43 UTC (permalink / raw)
To: Wanpeng Li
Cc: Johannes Weiner, KAMEZAWA Hiroyuki, Balbir Singh, Andrew Morton,
Eric Dumazet, Mike Frysinger, Arun Sharma,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cgroups-u79uwXL29TY76Z2rM5mHXA
On Mon 25-06-12 16:44:08, Wanpeng Li wrote:
> From: Wanpeng Li <liwp-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
>
> Unify memcg functions to mem_cgroup_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>
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 majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/4] memcg: change mem_control_xxx to mem_cgroup_xxx
@ 2012-06-25 9:43 ` Michal Hocko
0 siblings, 0 replies; 6+ messages in thread
From: Michal Hocko @ 2012-06-25 9:43 UTC (permalink / raw)
To: Wanpeng Li
Cc: Johannes Weiner, KAMEZAWA Hiroyuki, Balbir Singh, Andrew Morton,
Eric Dumazet, Mike Frysinger, Arun Sharma, linux-kernel, cgroups
On Mon 25-06-12 16:44:08, Wanpeng Li wrote:
> From: Wanpeng Li <liwp@linux.vnet.ibm.com>
>
> Unify memcg functions to mem_cgroup_xxx.
>
> Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
> Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
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 majordomo@vger.kernel.org
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/4] memcg: change mem_control_xxx to mem_cgroup_xxx
2012-06-25 8:44 ` Wanpeng Li
@ 2012-06-25 9:55 ` Kamezawa Hiroyuki
-1 siblings, 0 replies; 6+ messages in thread
From: Kamezawa Hiroyuki @ 2012-06-25 9:55 UTC (permalink / raw)
To: Wanpeng Li
Cc: Michal Hocko, Johannes Weiner, Balbir Singh, Andrew Morton,
Eric Dumazet, Mike Frysinger, Arun Sharma,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
cgroups-u79uwXL29TY76Z2rM5mHXA
(2012/06/25 17:44), Wanpeng Li wrote:
> From: Wanpeng Li <liwp-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
>
> Unify memcg functions to mem_cgroup_xxx.
>
> Signed-off-by: Wanpeng Li <liwp.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Acked-by: Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu-+CUm20s59erQFUHtdCDX3A@public.gmane.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/4] memcg: change mem_control_xxx to mem_cgroup_xxx
@ 2012-06-25 9:55 ` Kamezawa Hiroyuki
0 siblings, 0 replies; 6+ messages in thread
From: Kamezawa Hiroyuki @ 2012-06-25 9:55 UTC (permalink / raw)
To: Wanpeng Li
Cc: Michal Hocko, Johannes Weiner, Balbir Singh, Andrew Morton,
Eric Dumazet, Mike Frysinger, Arun Sharma, linux-kernel, cgroups
(2012/06/25 17:44), Wanpeng Li wrote:
> From: Wanpeng Li <liwp@linux.vnet.ibm.com>
>
> Unify memcg functions to mem_cgroup_xxx.
>
> Signed-off-by: Wanpeng Li <liwp.linux@gmail.com>
> Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-06-25 9:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-25 8:44 [PATCH v3 2/4] memcg: change mem_control_xxx to mem_cgroup_xxx Wanpeng Li
2012-06-25 8:44 ` Wanpeng Li
[not found] ` <1340613848-9536-1-git-send-email-liwp.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-06-25 9:43 ` Michal Hocko
2012-06-25 9:43 ` Michal Hocko
2012-06-25 9:55 ` Kamezawa Hiroyuki
2012-06-25 9:55 ` Kamezawa Hiroyuki
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.