cpuset: remove on stack cpumask_t in cpuset_can_attach()

[karo-tx-linux.git] / kernel / cpuset.c

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 41c2343df97560b3c28c5974a388d7d825c11e08..afa29cfc5bbb2ab6f740dc794346c1e247244e6f 100644 (file)
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1311,20 +1311,19 @@ static int cpuset_can_attach(struct cgroup_subsys *ss,
                             struct cgroup *cont, struct task_struct *tsk)
 {
        struct cpuset *cs = cgroup_cs(cont);
+       int ret = 0;
 
        if (cpus_empty(cs->cpus_allowed) || nodes_empty(cs->mems_allowed))
                return -ENOSPC;
-       if (tsk->flags & PF_THREAD_BOUND) {
-               cpumask_t mask;
 
+       if (tsk->flags & PF_THREAD_BOUND) {
                mutex_lock(&callback_mutex);
-               mask = cs->cpus_allowed;
+               if (!cpus_equal(tsk->cpus_allowed, cs->cpus_allowed))
+                       ret = -EINVAL;
                mutex_unlock(&callback_mutex);
-               if (!cpus_equal(tsk->cpus_allowed, mask))
-                       return -EINVAL;
        }
 
-       return security_task_setscheduler(tsk, 0, NULL);
+       return ret < 0 ? ret : security_task_setscheduler(tsk, 0, NULL);
 }
 
 static void cpuset_attach(struct cgroup_subsys *ss,