Quoting Aditya Kali (adityakali@xxxxxxxxxx): > move cgroup_get() and cgroup_put() into cgroup.h so that > they can be called from other places. > > Signed-off-by: Aditya Kali <adityakali@xxxxxxxxxx> Acked-by: Serge Hallyn <serge.hallyn@xxxxxxxxxxxxx> > --- > include/linux/cgroup.h | 22 ++++++++++++++++++++++ > kernel/cgroup.c | 22 ---------------------- > 2 files changed, 22 insertions(+), 22 deletions(-) > > diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h > index 80ed6e0..4a0eb2d 100644 > --- a/include/linux/cgroup.h > +++ b/include/linux/cgroup.h > @@ -521,6 +521,28 @@ static inline bool cgroup_on_dfl(const struct cgroup *cgrp) > return cgrp->root == &cgrp_dfl_root; > } > > +/* 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); > +} > + > /* no synchronization, the result can only be used as a hint */ > static inline bool cgroup_has_tasks(struct cgroup *cgrp) > { > diff --git a/kernel/cgroup.c b/kernel/cgroup.c > index 56d507b..2b3e9f9 100644 > --- a/kernel/cgroup.c > +++ b/kernel/cgroup.c > @@ -284,12 +284,6 @@ static struct cgroup_subsys_state *cgroup_e_css(struct cgroup *cgrp, > return cgroup_css(cgrp, ss); > } > > -/* convenient tests for these bits */ > -static inline bool cgroup_is_dead(const struct cgroup *cgrp) > -{ > - return !(cgrp->self.flags & CSS_ONLINE); > -} > - > struct cgroup_subsys_state *of_css(struct kernfs_open_file *of) > { > struct cgroup *cgrp = of->kn->parent->priv; > @@ -1002,22 +996,6 @@ static umode_t cgroup_file_mode(const struct cftype *cft) > return mode; > } > > -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); > -} > - > /** > * cgroup_refresh_child_subsys_mask - update child_subsys_mask > * @cgrp: the target cgroup > -- > 2.1.0.rc2.206.gedb03e5 > > _______________________________________________ > Containers mailing list > Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx > https://lists.linuxfoundation.org/mailman/listinfo/containers -- To unsubscribe from this list: send the line "unsubscribe linux-api" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html