From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753945Ab3LPMRY (ORCPT ); Mon, 16 Dec 2013 07:17:24 -0500 Received: from relay.parallels.com ([195.214.232.42]:56315 "EHLO relay.parallels.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753889Ab3LPMRT (ORCPT ); Mon, 16 Dec 2013 07:17:19 -0500 From: Vladimir Davydov To: , , , CC: , , , , , , Balbir Singh , KAMEZAWA Hiroyuki Subject: [PATCH v14 04/18] memcg: make for_each_mem_cgroup macros public Date: Mon, 16 Dec 2013 16:16:53 +0400 Message-ID: <935807f1cf90abb10423e049346c49ef7b6bcc2f.1387193771.git.vdavydov@parallels.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.30.16.96] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I am going to use these macros in next patches, so let's move them to the header. These macros are very handy and they depend only on mem_cgroup_iter(), which is already public, so I guess it's worth it. Signed-off-by: Vladimir Davydov Cc: Glauber Costa Cc: Michal Hocko Cc: Johannes Weiner Cc: Balbir Singh Cc: KAMEZAWA Hiroyuki --- include/linux/memcontrol.h | 15 +++++++++++++++ mm/memcontrol.c | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index b3e7a66..e3efab2 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -53,6 +53,21 @@ struct mem_cgroup_reclaim_cookie { unsigned int generation; }; +/* + * Iteration constructs for visiting all cgroups (under a tree). If + * loops are exited prematurely (break), mem_cgroup_iter_break() must + * be used for reference counting. + */ +#define for_each_mem_cgroup_tree(iter, root) \ + for (iter = mem_cgroup_iter(root, NULL, NULL); \ + iter != NULL; \ + iter = mem_cgroup_iter(root, iter, NULL)) + +#define for_each_mem_cgroup(iter) \ + for (iter = mem_cgroup_iter(NULL, NULL, NULL); \ + iter != NULL; \ + iter = mem_cgroup_iter(NULL, iter, NULL)) + #ifdef CONFIG_MEMCG /* * All "charge" functions with gfp_mask should use GFP_KERNEL or diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 8fdb239..b6ec029 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1261,21 +1261,6 @@ void mem_cgroup_iter_break(struct mem_cgroup *root, css_put(&prev->css); } -/* - * Iteration constructs for visiting all cgroups (under a tree). If - * loops are exited prematurely (break), mem_cgroup_iter_break() must - * be used for reference counting. - */ -#define for_each_mem_cgroup_tree(iter, root) \ - for (iter = mem_cgroup_iter(root, NULL, NULL); \ - iter != NULL; \ - iter = mem_cgroup_iter(root, iter, NULL)) - -#define for_each_mem_cgroup(iter) \ - for (iter = mem_cgroup_iter(NULL, NULL, NULL); \ - iter != NULL; \ - iter = mem_cgroup_iter(NULL, iter, NULL)) - void __mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx) { struct mem_cgroup *memcg; -- 1.7.10.4