[GIT PULL] cgroup: urgent fix for 3.4-rc1 merge window

[Tejun Heo]

Hello, Linus.

61d1d219c4 "cgroup: remove extra calls to find_existing_css_set" which
was part of the rc1 cgroup pull request made writes to cgroup "tasks"
file return 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.

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git for-3.4-fixes

Li Zefan (1):
      cgroup: update MAINTAINERS entry

Tejun Heo (1):
      cgroup: cgroup_attach_task() could return -errno after success

Thanks.
---
 MAINTAINERS     |    2 +-
 kernel/cgroup.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index f9faade..3dbf4d1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1940,7 +1940,7 @@ F:	drivers/connector/
 
 CONTROL GROUPS (CGROUPS)
 M:	Tejun Heo <tj@xxxxxxxxxx>
-M:	Li Zefan <lizf@xxxxxxxxxxxxxx>
+M:	Li Zefan <lizefan@xxxxxxxxxx>
 L:	containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
 L:	cgroups@xxxxxxxxxxxxxxx
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index f4ea4b6..ed64cca 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -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;

--
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/