Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281476
b: refs/heads/master
c: b07ef77
h: refs/heads/master
v: v3
  • Loading branch information
Mandeep Singh Baines authored and Tejun Heo committed Dec 22, 2011
1 parent 002295a commit 8386e19
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 026085ef5ae07c3197f2baacc091ce067b86ed11
refs/heads/master: b07ef7741122a83575499c11417e514877941e76
11 changes: 2 additions & 9 deletions trunk/kernel/cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8386e19

Please sign in to comment.