diff options
| author | Kirill Tkhai <ktkhai@parallels.com> | 2014-09-22 14:36:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-09-24 08:47:10 -0400 |
| commit | 16303ab2fe214635240a8f57cad2cd29792d4e3b (patch) | |
| tree | 520c75e0d4d333f35991358179d2b25454ef9963 /kernel | |
| parent | 66339c31bc3978d5fff9c4b4cb590a861def4db2 (diff) | |
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: Kirill Tkhai <ktkhai@parallels.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20140922183630.11015.59500.stgit@localhost
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index f0adb038170b..316127acefc6 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
| @@ -4029,14 +4029,14 @@ long sched_setaffinity(pid_t pid, const struct cpumask *in_mask) | |||
| 4029 | rcu_read_lock(); | 4029 | rcu_read_lock(); |
| 4030 | if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) { | 4030 | if (!ns_capable(__task_cred(p)->user_ns, CAP_SYS_NICE)) { |
| 4031 | rcu_read_unlock(); | 4031 | rcu_read_unlock(); |
| 4032 | goto out_unlock; | 4032 | goto out_free_new_mask; |
| 4033 | } | 4033 | } |
| 4034 | rcu_read_unlock(); | 4034 | rcu_read_unlock(); |
| 4035 | } | 4035 | } |
| 4036 | 4036 | ||
| 4037 | retval = security_task_setscheduler(p); | 4037 | retval = security_task_setscheduler(p); |
| 4038 | if (retval) | 4038 | if (retval) |
| 4039 | goto out_unlock; | 4039 | goto out_free_new_mask; |
| 4040 | 4040 | ||
| 4041 | 4041 | ||
| 4042 | cpuset_cpus_allowed(p, cpus_allowed); | 4042 | cpuset_cpus_allowed(p, cpus_allowed); |
| @@ -4054,7 +4054,7 @@ long sched_setaffinity(pid_t pid, const struct cpumask *in_mask) | |||
| 4054 | 4054 | ||
| 4055 | if (dl_bandwidth_enabled() && !cpumask_subset(span, new_mask)) { | 4055 | if (dl_bandwidth_enabled() && !cpumask_subset(span, new_mask)) { |
| 4056 | retval = -EBUSY; | 4056 | retval = -EBUSY; |
| 4057 | goto out_unlock; | 4057 | goto out_free_new_mask; |
| 4058 | } | 4058 | } |
| 4059 | } | 4059 | } |
| 4060 | #endif | 4060 | #endif |
| @@ -4073,7 +4073,7 @@ again: | |||
| 4073 | goto again; | 4073 | goto again; |
| 4074 | } | 4074 | } |
| 4075 | } | 4075 | } |
| 4076 | out_unlock: | 4076 | out_free_new_mask: |
| 4077 | free_cpumask_var(new_mask); | 4077 | free_cpumask_var(new_mask); |
| 4078 | out_free_cpus_allowed: | 4078 | out_free_cpus_allowed: |
| 4079 | free_cpumask_var(cpus_allowed); | 4079 | free_cpumask_var(cpus_allowed); |
