Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752077AbbKPTwN (ORCPT ); Mon, 16 Nov 2015 14:52:13 -0500 Received: from h2.hallyn.com ([78.46.35.8]:44970 "EHLO h2.hallyn.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751252AbbKPTwJ (ORCPT ); Mon, 16 Nov 2015 14:52:09 -0500 From: serge@hallyn.com To: linux-kernel@vger.kernel.org Cc: adityakali@google.com, tj@kernel.org, linux-api@vger.kernel.org, containers@lists.linux-foundation.org, cgroups@vger.kernel.org, lxc-devel@lists.linuxcontainers.org, akpm@linux-foundation.org, ebiederm@xmission.com Subject: [PATCH 4/8] cgroup: export cgroup_get() and cgroup_put() Date: Mon, 16 Nov 2015 13:51:41 -0600 Message-Id: <1447703505-29672-5-git-send-email-serge@hallyn.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1447703505-29672-1-git-send-email-serge@hallyn.com> References: <1447703505-29672-1-git-send-email-serge@hallyn.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2289 Lines: 85 From: Aditya Kali move cgroup_get() and cgroup_put() into cgroup.h so that they can be called from other places. Signed-off-by: Aditya Kali Acked-by: Serge Hallyn --- include/linux/cgroup.h | 21 +++++++++++++++++++++ kernel/cgroup.c | 22 ---------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 29f0b02..99096be 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -231,6 +231,27 @@ void css_task_iter_end(struct css_task_iter *it); #define css_for_each_descendant_post(pos, css) \ for ((pos) = css_next_descendant_post(NULL, (css)); (pos); \ (pos) = css_next_descendant_post((pos), (css))) +/* convenient tests for these bits */ +static inline bool cgroup_is_dead(const struct cgroup *cgrp) +{ + return !(cgrp->self.flags & CSS_ONLINE); +} + +static inline void cgroup_get(struct cgroup *cgrp) +{ + WARN_ON_ONCE(cgroup_is_dead(cgrp)); + css_get(&cgrp->self); +} + +static inline bool cgroup_tryget(struct cgroup *cgrp) +{ + return css_tryget(&cgrp->self); +} + +static inline void cgroup_put(struct cgroup *cgrp) +{ + css_put(&cgrp->self); +} /** * cgroup_taskset_for_each - iterate cgroup_taskset diff --git a/kernel/cgroup.c b/kernel/cgroup.c index e29c346..e972259 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -417,28 +417,6 @@ out_unlock: return css; } -/* convenient tests for these bits */ -static inline bool cgroup_is_dead(const struct cgroup *cgrp) -{ - return !(cgrp->self.flags & CSS_ONLINE); -} - -static void cgroup_get(struct cgroup *cgrp) -{ - WARN_ON_ONCE(cgroup_is_dead(cgrp)); - css_get(&cgrp->self); -} - -static bool cgroup_tryget(struct cgroup *cgrp) -{ - return css_tryget(&cgrp->self); -} - -static void cgroup_put(struct cgroup *cgrp) -{ - css_put(&cgrp->self); -} - struct cgroup_subsys_state *of_css(struct kernfs_open_file *of) { struct cgroup *cgrp = of->kn->parent->priv; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/