From: tip-bot for Michael Kerrisk <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
peterz@infradead.org, tglx@linutronix.de, mtk.manpages@gmail.com
Subject: [tip:sched/core] sched: Simplify return logic in sched_copy_attr( )
Date: Thu, 22 May 2014 05:26:48 -0700 [thread overview]
Message-ID: <tip-e78c7bca56dab5ce4f22694f99115ec07e4935f6@git.kernel.org> (raw)
In-Reply-To: <536CEC24.9080201@gmail.com>
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;
}
/**
next prev parent reply other threads:[~2014-05-22 12:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 14:49 [PATCH 0/3] sched: sched_setattr/sched_getattr fixes and improvements Michael Kerrisk (man-pages)
2014-05-09 14:54 ` [PATCH 1/3] sched: Make sched_setattr() correctly return -EFBIG Michael Kerrisk (man-pages)
2014-05-14 3:23 ` Michael Kerrisk (man-pages)
2014-05-19 13:06 ` [tip:sched/core] " tip-bot for Michael Kerrisk
2014-05-22 12:24 ` tip-bot for Michael Kerrisk
2014-05-09 14:54 ` [PATCH 2/3] sched: Simplify return logic in sched_copy_attr() Michael Kerrisk (man-pages)
2014-05-19 13:08 ` [tip:sched/core] sched: Simplify return logic in sched_copy_attr( ) tip-bot for Michael Kerrisk
2014-05-22 12:26 ` tip-bot for Michael Kerrisk [this message]
2014-05-09 14:54 ` [PATCH 3/3] sched: Simplify return logic in sched_read_attr() Michael Kerrisk (man-pages)
2014-05-19 13:08 ` [tip:sched/core] sched: Simplify return logic in sched_read_attr( ) tip-bot for Michael Kerrisk
2014-05-22 12:27 ` tip-bot for Michael Kerrisk
2014-05-09 17:16 ` [PATCH 0/3] sched: sched_setattr/sched_getattr fixes and improvements Peter Zijlstra
2014-05-13 18:09 ` Michael Kerrisk (man-pages)
2014-05-13 19:30 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-e78c7bca56dab5ce4f22694f99115ec07e4935f6@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mtk.manpages@gmail.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome