[PATCH cgroup/for-3.12-fixes] cgroup: fix cgroup post-order descendant walk of empty subtree

[PATCH cgroup/for-3.12-fixes] cgroup: fix cgroup post-order descendant walk of empty subtree

[Tejun Heo]

bd8815a6d8 ("cgroup: make css_for_each_descendant() and friends
include the origin css in the iteration") updated cgroup descendant
iterators to include the origin css; unfortuantely, it forgot to drop
special case handling in css_next_descendant_post() for empty subtree
leading to failure to visit the origin css without any child.

Fix it by dropping the special case handling and always returning the
leftmost descendant on the first iteration.

Signed-off-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
 kernel/cgroup.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index e0aeb32..8075b72 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -3187,11 +3187,9 @@ css_next_descendant_post(struct cgroup_subsys_state *pos,
 
 	WARN_ON_ONCE(!rcu_read_lock_held());
 
-	/* if first iteration, visit the leftmost descendant */
-	if (!pos) {
-		next = css_leftmost_descendant(root);
-		return next != root ? next : NULL;
-	}
+	/* if first iteration, visit leftmost descendant which may be @root */
+	if (!pos)
+		return css_leftmost_descendant(root);
 
 	/* if we visited @root, we're done */
 	if (pos == root)

Re: [PATCH cgroup/for-3.12-fixes] cgroup: fix cgroup post-order descendant walk of empty subtree

[Li Zefan]

On 2013/9/7 3:31, Tejun Heo wrote:
> bd8815a6d8 ("cgroup: make css_for_each_descendant() and friends
> include the origin css in the iteration") updated cgroup descendant
> iterators to include the origin css; unfortuantely, it forgot to drop
> special case handling in css_next_descendant_post() for empty subtree
> leading to failure to visit the origin css without any child.
> 
> Fix it by dropping the special case handling and always returning the
> leftmost descendant on the first iteration.
> 
> Signed-off-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

Acked-by: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>

Re: [PATCH cgroup/for-3.12-fixes] cgroup: fix cgroup post-order descendant walk of empty subtree

[Tejun Heo]

On Fri, Sep 06, 2013 at 03:31:08PM -0400, Tejun Heo wrote:
> bd8815a6d8 ("cgroup: make css_for_each_descendant() and friends
> include the origin css in the iteration") updated cgroup descendant
> iterators to include the origin css; unfortuantely, it forgot to drop
> special case handling in css_next_descendant_post() for empty subtree
> leading to failure to visit the origin css without any child.
> 
> Fix it by dropping the special case handling and always returning the
> leftmost descendant on the first iteration.
> 
> Signed-off-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>

Applied to cgroup/for-3.12-fixes.

Thanks.

-- 
tejun