From: Wanpeng Li Subject: [PATCH 3/5 v2] memcg: change mem_control_xxx to mem_cgroup_xxx Date: Mon, 25 Jun 2012 14:06:22 +0800 Message-ID: <1340604382-8091-1-git-send-email-liwp.linux@gmail.com> Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=/4jXOvjSLQr6pWhC4p+Xt4Y3JglmFzZJPI1DVadYtfo=; b=Ywrkz3NB0ZWEr0OEB4cwopHiI71BQfjJmlnEcCcEhWVzQDx+k5VG8erlausgll2GPY jLSjWkc2EvfoW9Rev8QXzOIQb1PmsV1hpWnysyzX+DSIwb39/Axgu5HYqomtpuHejiLD 3IS7HGBsqPM2BIQyu+A9bxixUXqR7abD3XEWLNzt3++ZCy3OZ6Xc63NJ2oT276lVDSUc DtFUyf4FOnHdqllcaSTNzDj54huwS4tlMLdXa3/AOMMhHkyaqMLcgsdTS2npcLOGKQR8 X71LZt469k9xrWJT1ne0uNFU9Nx04K4e3dfz60MwHgswZmqOONdGhmxA2chmLTjem9O/ GyYw== Sender: cgroups-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Michal Hocko Cc: Johannes Weiner , KAMEZAWA Hiroyuki , Balbir Singh , Andrew Morton , Eric Dumazet , Mike Frysinger , Arun Sharma , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Wanpeng Li From: Wanpeng Li Unify memcg functions to mem_cgroup_xxx. Signed-off-by: Wanpeng Li Acked-by: Johannes Weiner --- 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