aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-05-23 21:55:38 -0400
committerTejun Heo <tj@kernel.org>2013-05-23 21:55:38 -0400
commitbdc7119f1bdd0632d42f435941dc290216a436e7 (patch)
tree3e33099f7e22b637e3ffa9f558938e92e94fd9a6
parent3f33e64f4a212771a0b5c63eddaa7f81e65223e3 (diff)
cgroup: make cgroup_is_removed() static
cgroup_is_removed() no longer has external users and it shouldn't grow any - controllers should deal with cgroup_subsys_state on/offline state instead of cgroup removal state. Make it static. While at it, make it return bool. Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--include/linux/cgroup.h1
-rw-r--r--kernel/cgroup.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 1df5f699be61..8d9f3c911fca 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -538,7 +538,6 @@ static inline const char *cgroup_name(const struct cgroup *cgrp)
538int cgroup_add_cftypes(struct cgroup_subsys *ss, struct cftype *cfts); 538int cgroup_add_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
539int cgroup_rm_cftypes(struct cgroup_subsys *ss, struct cftype *cfts); 539int cgroup_rm_cftypes(struct cgroup_subsys *ss, struct cftype *cfts);
540 540
541int cgroup_is_removed(const struct cgroup *cgrp);
542bool cgroup_is_descendant(struct cgroup *cgrp, struct cgroup *ancestor); 541bool cgroup_is_descendant(struct cgroup *cgrp, struct cgroup *ancestor);
543 542
544int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen); 543int cgroup_path(const struct cgroup *cgrp, char *buf, int buflen);
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index a19419f4af1a..501974823b33 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -226,7 +226,7 @@ static int css_refcnt(struct cgroup_subsys_state *css)
226} 226}
227 227
228/* convenient tests for these bits */ 228/* convenient tests for these bits */
229inline int cgroup_is_removed(const struct cgroup *cgrp) 229static inline bool cgroup_is_removed(const struct cgroup *cgrp)
230{ 230{
231 return test_bit(CGRP_REMOVED, &cgrp->flags); 231 return test_bit(CGRP_REMOVED, &cgrp->flags);
232} 232}