Commit-ID:  418cc9ad0cd4f67c360cdf8f4f00c3b588fb0c78
Gitweb:     http://git.kernel.org/tip/418cc9ad0cd4f67c360cdf8f4f00c3b588fb0c78
Author:     Dongsheng Yang <yangds.f...@cn.fujitsu.com>
AuthorDate: Thu, 8 May 2014 18:35:15 +0900
Committer:  Thomas Gleixner <t...@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: mi...@redhat.com
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: Thomas Gleixner <t...@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;
 
--
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