From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Blum Subject: [PATCH][BUGFIX] cgroups: fix ordering of calls in cgroup_attach_proc Date: Mon, 15 Aug 2011 19:11:56 -0400 Message-ID: <20110815231156.GC6867__25299.900052096$1313449968$gmane$org@unix33.andrew.cmu.edu> References: <20110727171101.5e32d8eb@notabene.brown> <20110727150710.GB5242@unix33.andrew.cmu.edu> <20110727234235.GA2318@linux.vnet.ibm.com> <20110728110813.7ff84b13@notabene.brown> <20110728062616.GC15204@unix33.andrew.cmu.edu> <20110728171345.67d3797d@notabene.brown> <20110729142842.GA8462@unix33.andrew.cmu.edu> <20110815184957.GA16588@redhat.com> <20110815225003.GB29942@somewhere> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20110815225003.GB29942@somewhere> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Frederic Weisbecker Cc: Ben Blum , containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Oleg Nesterov , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , NeilBrown , Paul Menage , paulmck-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org, Andrew Morton List-Id: containers.vger.kernel.org Fix ordering of cgroup_task_migrate and attach_task in cgroup_attach_proc. Signed-off-by: Ben Blum --- kernel/cgroup.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff -u a/kernel/cgroup.c b/kernel/cgroup.c --- a/kernel/cgroup.c 2011-08-15 19:05:37.308401219 -0400 +++ b/kernel/cgroup.c 2011-08-15 19:07:47.376775142 -0400 @@ -2132,14 +2132,17 @@ oldcgrp = task_cgroup_from_root(tsk, root); if (cgrp == oldcgrp) continue; - /* attach each task to each subsystem */ - for_each_subsys(root, ss) { - if (ss->attach_task) - ss->attach_task(cgrp, tsk); - } /* if the thread is PF_EXITING, it can just get skipped. */ retval = cgroup_task_migrate(cgrp, oldcgrp, tsk, true); - BUG_ON(retval != 0 && retval != -ESRCH); + if (retval == 0) { + /* attach each task to each subsystem */ + for_each_subsys(root, ss) { + if (ss->attach_task) + ss->attach_task(cgrp, tsk); + } + } else { + BUG_ON(retval != -ESRCH); + } } /* nothing is sensitive to fork() after this point. */