From 8386e191ad918c285e972d0316ace5b396cd78b7 Mon Sep 17 00:00:00 2001
From: Mandeep Singh Baines <msb@chromium.org>
Date: Wed, 21 Dec 2011 20:18:36 -0800
Subject: [PATCH] --- yaml --- r: 281476 b: refs/heads/master c:
 b07ef7741122a83575499c11417e514877941e76 h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/kernel/cgroup.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index b8190e0679f6..9271ce68f504 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 026085ef5ae07c3197f2baacc091ce067b86ed11
+refs/heads/master: b07ef7741122a83575499c11417e514877941e76
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index 82288088f6a5..a85a7002ca33 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -2116,7 +2116,7 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
 		retval = -EAGAIN;
 		goto out_free_group_list;
 	}
-	/* take a reference on each task in the group to go in the array. */
+
 	tsk = leader;
 	i = nr_migrating_tasks = 0;
 	do {
@@ -2128,7 +2128,6 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
 
 		/* as per above, nr_threads may decrease, but not increase. */
 		BUG_ON(i >= group_size);
-		get_task_struct(tsk);
 		/*
 		 * saying GFP_ATOMIC has no effect here because we did prealloc
 		 * earlier, but it's good form to communicate our expectations.
@@ -2150,7 +2149,7 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
 	/* methods shouldn't be called if no task is actually migrating */
 	retval = 0;
 	if (!nr_migrating_tasks)
-		goto out_put_tasks;
+		goto out_free_group_list;
 
 	/*
 	 * step 1: check that we can legitimately attach to the cgroup.
@@ -2234,12 +2233,6 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
 				ss->cancel_attach(ss, cgrp, &tset);
 		}
 	}
-out_put_tasks:
-	/* clean up the array of referenced threads in the group. */
-	for (i = 0; i < group_size; i++) {
-		tc = flex_array_get(group, i);
-		put_task_struct(tc->task);
-	}
 out_free_group_list:
 	flex_array_free(group);
 	return retval;