From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wanpeng Li Subject: [PATCH v4 2/2] memcg: change mem_control_xxx to mem_cgroup_xxx Date: Mon, 25 Jun 2012 19:15:59 +0800 Message-ID: <1340622959-13136-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=yl2ZEa7Jj+7Mzm5x3P1/o8Ko4C+yG5kVMv2lU0zzx8M=; b=HzIPF2e95tXFxzN5/LYh5qpAnh5hSK/KhBFc9r0vswKQ+Zm1mrkX7s6/VmCINfS+Wl c6GAJTlO6QiNZIffp1PJlVsn78Ady4j40ROlX3QV76Ovw/saREXc56BV0ntwSNcqJy+R brdMQYD/nRXYRbJOMbxV1CPj2ZOTKQXdOoqtQZIlNaJNjQ80gg19DmhLqd5aJFRK6cGs bn4K9x2DuDs3hERvs1XcsFYh+TICfMYWq/nkkCzRY5dwrEEde0cWdpZWAezWHjckBU5T P5GzdE08How8UPK1dhuKS/EiRhmcBaJtUHjc/csc/0Srz94vfq01tiPrJliCTgabp08c 50CQ== 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 , 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 Acked-by: Michal Hocko Acked-by: KAMEZAWA Hiroyuki --- 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