device_cgroup: remove direct access to cgroup->children
authorTejun Heo <tj@kernel.org>
Fri, 16 May 2014 17:22:48 +0000 (13:22 -0400)
committerTejun Heo <tj@kernel.org>
Fri, 16 May 2014 17:22:48 +0000 (13:22 -0400)
Currently, devcg::has_children() directly tests cgroup->children for
list emptiness.  The field is not a published field and scheduled to
go away.  In addition, the test isn't strictly correct as devcg should
only care about children which are visible to userland.

This patch converts has_children() to use css_next_child() instead.
The subtle incorrectness is noted and will be dealt with later.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Aristeu Rozanski <aris@redhat.com>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Li Zefan <lizefan@huawei.com>
security/device_cgroup.c

index ce14a31b1337a28f67479cb2c88306cd371c5978..084c8e417564aced290b90e703ddca2cc6bc3108 100644 (file)
@@ -589,9 +589,17 @@ static int propagate_exception(struct dev_cgroup *devcg_root,
 
 static inline bool has_children(struct dev_cgroup *devcgroup)
 {
-       struct cgroup *cgrp = devcgroup->css.cgroup;
+       bool ret;
 
-       return !list_empty(&cgrp->children);
+       /*
+        * FIXME: There may be lingering offline csses and this function
+        * may return %true when there isn't any userland-visible child
+        * which is incorrect for our purposes.
+        */
+       rcu_read_lock();
+       ret = css_next_child(NULL, &devcgroup->css);
+       rcu_read_unlock();
+       return ret;
 }
 
 /*