evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cgroup: separate out cgroup_has_live_children() from cgroup_destroy_locked()

Browse source 
We're expecting another user.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
This commit is contained in:
Tejun Heo 2014-05-14 09:15:01 -04:00
parent 9d800df12d
commit cbc125efad
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
kernel/cgroup.c
View file

@ -3295,6 +3295,21 @@ css_next_descendant_post(struct cgroup_subsys_state *pos,
return css_parent(pos); return css_parent(pos);
} }
static bool cgroup_has_live_children(struct cgroup *cgrp)
{
struct cgroup *child;
rcu_read_lock();
list_for_each_entry_rcu(child, &cgrp->children, sibling) {
if (!cgroup_is_dead(child)) {
rcu_read_unlock();
return true;
}
}
rcu_read_unlock();
return false;
}
/** /**
* css_advance_task_iter - advance a task itererator to the next css_set * css_advance_task_iter - advance a task itererator to the next css_set
* @it: the iterator to advance * @it: the iterator to advance
@ -4465,7 +4480,6 @@ static void kill_css(struct cgroup_subsys_state *css)
static int cgroup_destroy_locked(struct cgroup *cgrp) static int cgroup_destroy_locked(struct cgroup *cgrp)
__releases(&cgroup_mutex) __acquires(&cgroup_mutex) __releases(&cgroup_mutex) __acquires(&cgroup_mutex)
{ {
struct cgroup *child;
struct cgroup_subsys_state *css; struct cgroup_subsys_state *css;
bool empty; bool empty;
int ssid; int ssid;
@ -4487,15 +4501,7 @@ static int cgroup_destroy_locked(struct cgroup *cgrp)
* emptiness as dead children linger on it while being destroyed; * emptiness as dead children linger on it while being destroyed;
* otherwise, "rmdir parent/child parent" may fail with -EBUSY. * otherwise, "rmdir parent/child parent" may fail with -EBUSY.
*/ */
empty = true; if (cgroup_has_live_children(cgrp))
rcu_read_lock();
list_for_each_entry_rcu(child, &cgrp->children, sibling) {
empty = cgroup_is_dead(child);
if (!empty)
break;
}
rcu_read_unlock();
if (!empty)
return -EBUSY; return -EBUSY;
/* /*