|
|
@@ -278,7 +278,7 @@ static struct cgroup_subsys_state *cgroup_e_css(struct cgroup *cgrp,
|
|
|
/* convenient tests for these bits */
|
|
|
static inline bool cgroup_is_dead(const struct cgroup *cgrp)
|
|
|
{
|
|
|
- return test_bit(CGRP_DEAD, &cgrp->flags);
|
|
|
+ return !(cgrp->self.flags & CSS_ONLINE);
|
|
|
}
|
|
|
|
|
|
struct cgroup_subsys_state *of_css(struct kernfs_open_file *of)
|
|
|
@@ -1518,6 +1518,7 @@ static void init_cgroup_housekeeping(struct cgroup *cgrp)
|
|
|
INIT_LIST_HEAD(&cgrp->pidlists);
|
|
|
mutex_init(&cgrp->pidlist_mutex);
|
|
|
cgrp->self.cgroup = cgrp;
|
|
|
+ cgrp->self.flags |= CSS_ONLINE;
|
|
|
|
|
|
for_each_subsys(ss, ssid)
|
|
|
INIT_LIST_HEAD(&cgrp->e_csets[ssid]);
|
|
|
@@ -4541,13 +4542,13 @@ static int cgroup_destroy_locked(struct cgroup *cgrp)
|
|
|
* Mark @cgrp dead. This prevents further task migration and child
|
|
|
* creation by disabling cgroup_lock_live_group().
|
|
|
*/
|
|
|
- set_bit(CGRP_DEAD, &cgrp->flags);
|
|
|
+ cgrp->self.flags &= ~CSS_ONLINE;
|
|
|
|
|
|
/* initiate massacre of all css's */
|
|
|
for_each_css(css, ssid, cgrp)
|
|
|
kill_css(css);
|
|
|
|
|
|
- /* CGRP_DEAD is set, remove from ->release_list for the last time */
|
|
|
+ /* CSS_ONLINE is clear, remove from ->release_list for the last time */
|
|
|
raw_spin_lock(&release_list_lock);
|
|
|
if (!list_empty(&cgrp->release_list))
|
|
|
list_del_init(&cgrp->release_list);
|