Commit 16303ab2 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by Ingo Molnar

sched: cleanup: Rename 'out_unlock' to 'out_free_new_mask'

Nothing is locked there, so label's name only confuses a reader.
Signed-off-by: default avatarKirill Tkhai <ktkhai@parallels.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20140922183630.11015.59500.stgit@localhostSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 66339c31
...@@ -4029,14 +4029,14 @@ long sched_setaffinity(pid_t pid, const struct cpumask *in_mask) ...@@ -4029,14 +4029,14 @@ long sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
rcu_read_lock(); rcu_read_lock();
if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) { if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) {
rcu_read_unlock(); rcu_read_unlock();
goto out_unlock; goto out_free_new_mask;
} }
rcu_read_unlock(); rcu_read_unlock();
} }
retval = security_task_setscheduler(p); retval = security_task_setscheduler(p);
if (retval) if (retval)
goto out_unlock; goto out_free_new_mask;
cpuset_cpus_allowed(p, cpus_allowed); cpuset_cpus_allowed(p, cpus_allowed);
...@@ -4054,7 +4054,7 @@ long sched_setaffinity(pid_t pid, const struct cpumask *in_mask) ...@@ -4054,7 +4054,7 @@ long sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
if (dl_bandwidth_enabled() && !cpumask_subset(span, new_mask)) { if (dl_bandwidth_enabled() && !cpumask_subset(span, new_mask)) {
retval = -EBUSY; retval = -EBUSY;
goto out_unlock; goto out_free_new_mask;
} }
} }
#endif #endif
...@@ -4073,7 +4073,7 @@ long sched_setaffinity(pid_t pid, const struct cpumask *in_mask) ...@@ -4073,7 +4073,7 @@ long sched_setaffinity(pid_t pid, const struct cpumask *in_mask)
goto again; goto again;
} }
} }
out_unlock: out_free_new_mask:
free_cpumask_var(new_mask); free_cpumask_var(new_mask);
out_free_cpus_allowed: out_free_cpus_allowed:
free_cpumask_var(cpus_allowed); free_cpumask_var(cpus_allowed);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment