* [PATCH] sched: Use clamp() and clamp_val() to make it more readable.
@ 2014-05-08 9:35 Dongsheng Yang
2014-05-19 13:09 ` [tip:sched/core] " tip-bot for Dongsheng Yang
2014-05-22 12:27 ` [tip:sched/core] sched: Use clamp() and clamp_val() to make sys_nice() " tip-bot for Dongsheng Yang
0 siblings, 2 replies; 3+ messages in thread
From: Dongsheng Yang @ 2014-05-08 9:35 UTC (permalink / raw)
To: mingo, peterz; +Cc: linux-kernel, Dongsheng Yang
As Kees suggested, I use clamp() function to replace the if and
else branch, making it more readable and modular.
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
---
kernel/sched/core.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ff871f5..79f8638 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3039,17 +3039,10 @@ SYSCALL_DEFINE1(nice, int, increment)
* We don't have to worry. Conceptually one call occurs first
* and we have a single winner.
*/
- if (increment < -40)
- increment = -40;
- if (increment > 40)
- increment = 40;
-
+ increment = clamp(increment, -NICE_WIDTH, NICE_WIDTH);
nice = task_nice(current) + increment;
- if (nice < MIN_NICE)
- nice = MIN_NICE;
- if (nice > MAX_NICE)
- nice = MAX_NICE;
+ nice = clamp_val(nice, MIN_NICE, MAX_NICE);
if (increment < 0 && !can_nice(current, nice))
return -EPERM;
--
1.8.2.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [tip:sched/core] sched: Use clamp() and clamp_val() to make it more readable.
2014-05-08 9:35 [PATCH] sched: Use clamp() and clamp_val() to make it more readable Dongsheng Yang
@ 2014-05-19 13:09 ` tip-bot for Dongsheng Yang
2014-05-22 12:27 ` [tip:sched/core] sched: Use clamp() and clamp_val() to make sys_nice() " tip-bot for Dongsheng Yang
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Dongsheng Yang @ 2014-05-19 13:09 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, keescook, peterz, tglx, yangds.fnst
Commit-ID: 418cc9ad0cd4f67c360cdf8f4f00c3b588fb0c78
Gitweb: http://git.kernel.org/tip/418cc9ad0cd4f67c360cdf8f4f00c3b588fb0c78
Author: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
AuthorDate: Thu, 8 May 2014 18:35:15 +0900
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 19 May 2014 22:02:41 +0900
sched: Use clamp() and clamp_val() to make it more readable.
As Kees suggested, I use clamp() function to replace the if and
else branch, making it more readable and modular.
Cc: mingo@redhat.com
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1399541715-19568-1-git-send-email-yangds.fnst@cn.fujitsu.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/sched/core.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 354cd5a..10d9b50 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3057,17 +3057,10 @@ SYSCALL_DEFINE1(nice, int, increment)
* We don't have to worry. Conceptually one call occurs first
* and we have a single winner.
*/
- if (increment < -40)
- increment = -40;
- if (increment > 40)
- increment = 40;
-
+ increment = clamp(increment, -NICE_WIDTH, NICE_WIDTH);
nice = task_nice(current) + increment;
- if (nice < MIN_NICE)
- nice = MIN_NICE;
- if (nice > MAX_NICE)
- nice = MAX_NICE;
+ nice = clamp_val(nice, MIN_NICE, MAX_NICE);
if (increment < 0 && !can_nice(current, nice))
return -EPERM;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [tip:sched/core] sched: Use clamp() and clamp_val() to make sys_nice() more readable
2014-05-08 9:35 [PATCH] sched: Use clamp() and clamp_val() to make it more readable Dongsheng Yang
2014-05-19 13:09 ` [tip:sched/core] " tip-bot for Dongsheng Yang
@ 2014-05-22 12:27 ` tip-bot for Dongsheng Yang
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Dongsheng Yang @ 2014-05-22 12:27 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, keescook, peterz, tglx, yangds.fnst
Commit-ID: a9467fa3cd2d5bf39e7cb7d0706d29d7ef4df212
Gitweb: http://git.kernel.org/tip/a9467fa3cd2d5bf39e7cb7d0706d29d7ef4df212
Author: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
AuthorDate: Thu, 8 May 2014 18:35:15 +0900
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 22 May 2014 11:16:31 +0200
sched: Use clamp() and clamp_val() to make sys_nice() more readable
Suggested-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1399541715-19568-1-git-send-email-yangds.fnst@cn.fujitsu.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/core.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 6340c60..f5605b6 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3057,17 +3057,10 @@ SYSCALL_DEFINE1(nice, int, increment)
* We don't have to worry. Conceptually one call occurs first
* and we have a single winner.
*/
- if (increment < -40)
- increment = -40;
- if (increment > 40)
- increment = 40;
-
+ increment = clamp(increment, -NICE_WIDTH, NICE_WIDTH);
nice = task_nice(current) + increment;
- if (nice < MIN_NICE)
- nice = MIN_NICE;
- if (nice > MAX_NICE)
- nice = MAX_NICE;
+ nice = clamp_val(nice, MIN_NICE, MAX_NICE);
if (increment < 0 && !can_nice(current, nice))
return -EPERM;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-22 12:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-08 9:35 [PATCH] sched: Use clamp() and clamp_val() to make it more readable Dongsheng Yang
2014-05-19 13:09 ` [tip:sched/core] " tip-bot for Dongsheng Yang
2014-05-22 12:27 ` [tip:sched/core] sched: Use clamp() and clamp_val() to make sys_nice() " tip-bot for Dongsheng Yang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox