Commit-ID:  a9467fa3cd2d5bf39e7cb7d0706d29d7ef4df212
Gitweb:     http://git.kernel.org/tip/a9467fa3cd2d5bf39e7cb7d0706d29d7ef4df212
Author:     Dongsheng Yang <yangds.f...@cn.fujitsu.com>
AuthorDate: Thu, 8 May 2014 18:35:15 +0900
Committer:  Ingo Molnar <mi...@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 <keesc...@chromium.org>
Signed-off-by: Dongsheng Yang <yangds.f...@cn.fujitsu.com>
Signed-off-by: Peter Zijlstra <pet...@infradead.org>
Link: 
http://lkml.kernel.org/r/1399541715-19568-1-git-send-email-yangds.f...@cn.fujitsu.com
Signed-off-by: Ingo Molnar <mi...@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;
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to