Skip to content

Commit

Permalink
cgroup: update subsystem rebind restrictions
Browse files Browse the repository at this point in the history
Because the default root couldn't have any non-root csses attached to
it, rebinding away from it was always allowed; however, the default
hierarchy will soon host the unified hierarchy and have non-root csses
so the rebind restrictions need to be updated accordingly.

Instead of special casing rebinding from the default hierarchy and
then checking whether the source hierarchy has children cgroups, which
implies non-root csses for !dfl hierarchies, simply check whether the
source hierarchy has non-root csses for the subsystem using
css_next_child().

Signed-off-by: Tejun Heo <[email protected]>
Acked-by: Li Zefan <[email protected]>
  • Loading branch information
htejun committed Apr 23, 2014
1 parent 6803c00 commit 7fd8c56
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions kernel/cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1051,16 +1051,12 @@ static int rebind_subsystems(struct cgroup_root *dst_root,
if (!(ss_mask & (1 << ssid)))
continue;

/* if @ss is on the dummy_root, we can always move it */
if (ss->root == &cgrp_dfl_root)
continue;

/* if @ss has non-root cgroups attached to it, can't move */
if (!list_empty(&ss->root->cgrp.children))
/* if @ss has non-root csses attached to it, can't move */
if (css_next_child(NULL, cgroup_css(&ss->root->cgrp, ss)))
return -EBUSY;

/* can't move between two non-dummy roots either */
if (dst_root != &cgrp_dfl_root)
if (ss->root != &cgrp_dfl_root && dst_root != &cgrp_dfl_root)
return -EBUSY;
}

Expand Down

0 comments on commit 7fd8c56

Please sign in to comment.