From: Tejun Heo Date: Tue, 8 Mar 2016 16:51:25 +0000 (-0500) Subject: cgroup: fix incorrect destination cgroup in cgroup_update_dfl_csses() X-Git-Tag: Ubuntu-4.10.0-19.21~3732^2~7 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=58cdb1ceb15aab7b34719ad225ff023775d774e7;p=mirror_ubuntu-artful-kernel.git cgroup: fix incorrect destination cgroup in cgroup_update_dfl_csses() cgroup_update_dfl_csses() should move each task in the subtree to self; however, it was incorrectly calling cgroup_migrate_add_src() with the root of the subtree as @dst_cgrp. Fortunately, cgroup_migrate_add_src() currently uses @dst_cgrp only to determine the hierarchy and the bug doesn't cause any actual breakages. Fix it. Signed-off-by: Tejun Heo --- diff --git a/kernel/cgroup.c b/kernel/cgroup.c index c63fce0c5b24..50879aadcbd0 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2901,7 +2901,7 @@ static int cgroup_update_dfl_csses(struct cgroup *cgrp) struct cgrp_cset_link *link; list_for_each_entry(link, &dsct->cset_links, cset_link) - cgroup_migrate_add_src(link->cset, cgrp, + cgroup_migrate_add_src(link->cset, dsct, &preloaded_csets); } spin_unlock_bh(&css_set_lock);