summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 548d8d4e86d0..bab5c17e7781 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2175,9 +2175,12 @@ static int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
oldcg = tc->task->cgroups;
/* if we don't already have it in the list get a new one */
- if (!css_set_check_fetched(cgrp, tc->task, oldcg, &newcg_list))
- if (retval = css_set_prefetch(cgrp, oldcg, &newcg_list))
+ if (!css_set_check_fetched(cgrp, tc->task, oldcg,
+ &newcg_list)) {
+ retval = css_set_prefetch(cgrp, oldcg, &newcg_list);
+ if (retval)
goto out_list_teardown;
+ }
}
/*