Commit 13386314 authored Mar 29, 2012 by Linus Torvalds

cgroup

Pull urgent cgroup fix from Tejun Heo:
 "Commit 61d1d219 ('cgroup: remove extra calls to
  find_existing_css_set') which was part of the rc1 cgroup pull request
  made writes to the cgroup "tasks" file return an uninitialized retval
  on success which can cause boot failures with systemd.

  The change stayed in linux-next for quite some time but gcc
  interestingly failed to emit warning about using uninitialized
  variable and the problem seems to materialize only for certain build
  combinations (probably depends on register allocation).

  It's just missing local variable initialization and the fix is trivial
  & safe.  As the problem is critical when it materializes, I'm
  fast-tracking it.  Also included is Li's email address change in
  MAINTAINERS."

* 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: cgroup_attach_task() could return -errno after success
  cgroup: update MAINTAINERS entry

parents 4bde23f8 8f121918

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -1940,7 +1940,7 @@ F: drivers/connector/

		CONTROL GROUPS (CGROUPS)
		M: Tejun Heo <tj@kernel.org>
		M: Li Zefan <lizf@cn.fujitsu.com>
		M: Li Zefan <lizefan@huawei.com>
		L: containers@lists.linux-foundation.org
		L: cgroups@vger.kernel.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git

kernel/cgroup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1883,7 +1883,7 @@ static void cgroup_task_migrate(struct cgroup cgrp, struct cgroup oldcgrp,
		*/
		int cgroup_attach_task(struct cgroup cgrp, struct task_struct tsk)
		{
		int retval;
		int retval = 0;
		struct cgroup_subsys ss, failed_ss = NULL;
		struct cgroup *oldcgrp;
		struct cgroupfs_root *root = cgrp->root;

Admin message