Messages in this thread Patch in this message | | | Date | Thu, 22 May 2014 05:26:48 -0700 | From | tip-bot for Michael Kerrisk <> | Subject | [tip:sched/core] sched: Simplify return logic in sched_copy_attr( ) |
| |
Commit-ID: e78c7bca56dab5ce4f22694f99115ec07e4935f6 Gitweb: http://git.kernel.org/tip/e78c7bca56dab5ce4f22694f99115ec07e4935f6 Author: Michael Kerrisk <mtk.manpages@gmail.com> AuthorDate: Fri, 9 May 2014 16:54:28 +0200 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Thu, 22 May 2014 11:16:26 +0200
sched: Simplify return logic in sched_copy_attr()
The logic in this function is a little contorted, clean it up:
* Rather than having chained gotos for the -EFBIG case, just return -EFBIG directly.
* Now, the label 'out' is no longer needed, and 'ret' must be zero zero by the time we fall through to this point, so just return 0.
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/536CEC24.9080201@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org> --- kernel/sched/core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 2551b6d..2318fc4 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3657,13 +3657,11 @@ static int sched_copy_attr(struct sched_attr __user *uattr, */ attr->sched_nice = clamp(attr->sched_nice, MIN_NICE, MAX_NICE); -out: - return ret; + return 0; err_size: put_user(sizeof(*attr), &uattr->size); - ret = -E2BIG; - goto out; + return -E2BIG; } /**
| |