diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2006-08-21 10:02:50 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@suse.de> | 2006-08-21 10:02:50 +0200 |
| commit | e014ff8d4285b81f0de0719d8eee72bc50bfd4be (patch) | |
| tree | 5d60afed23d2f4ced4ccce961415cdfe15295a21 | |
| parent | 9f83e45eb54fc7198dc59fc63255341851ba4c48 (diff) | |
| download | linux-3.10-e014ff8d4285b81f0de0719d8eee72bc50bfd4be.tar.gz linux-3.10-e014ff8d4285b81f0de0719d8eee72bc50bfd4be.tar.bz2 linux-3.10-e014ff8d4285b81f0de0719d8eee72bc50bfd4be.zip | |
[PATCH] uninline ioprio_best()
Saves 376 bytes (5 callers) for me.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Jens Axboe <axboe@suse.de>
| -rw-r--r-- | fs/ioprio.c | 23 | ||||
| -rw-r--r-- | include/linux/ioprio.h | 23 |
2 files changed, 24 insertions, 22 deletions
diff --git a/fs/ioprio.c b/fs/ioprio.c index 06578311c63..78b1deae3fa 100644 --- a/fs/ioprio.c +++ b/fs/ioprio.c @@ -140,6 +140,29 @@ out: return ret; } +int ioprio_best(unsigned short aprio, unsigned short bprio) +{ + unsigned short aclass = IOPRIO_PRIO_CLASS(aprio); + unsigned short bclass = IOPRIO_PRIO_CLASS(bprio); + + if (!ioprio_valid(aprio)) + return bprio; + if (!ioprio_valid(bprio)) + return aprio; + + if (aclass == IOPRIO_CLASS_NONE) + aclass = IOPRIO_CLASS_BE; + if (bclass == IOPRIO_CLASS_NONE) + bclass = IOPRIO_CLASS_BE; + + if (aclass == bclass) + return min(aprio, bprio); + if (aclass > bclass) + return bprio; + else + return aprio; +} + asmlinkage long sys_ioprio_get(int which, int who) { struct task_struct *g, *p; diff --git a/include/linux/ioprio.h b/include/linux/ioprio.h index 88d5961f7a3..8e2042b9d47 100644 --- a/include/linux/ioprio.h +++ b/include/linux/ioprio.h @@ -59,27 +59,6 @@ static inline int task_nice_ioprio(struct task_struct *task) /* * For inheritance, return the highest of the two given priorities */ -static inline int ioprio_best(unsigned short aprio, unsigned short bprio) -{ - unsigned short aclass = IOPRIO_PRIO_CLASS(aprio); - unsigned short bclass = IOPRIO_PRIO_CLASS(bprio); - - if (!ioprio_valid(aprio)) - return bprio; - if (!ioprio_valid(bprio)) - return aprio; - - if (aclass == IOPRIO_CLASS_NONE) - aclass = IOPRIO_CLASS_BE; - if (bclass == IOPRIO_CLASS_NONE) - bclass = IOPRIO_CLASS_BE; - - if (aclass == bclass) - return min(aprio, bprio); - if (aclass > bclass) - return bprio; - else - return aprio; -} +extern int ioprio_best(unsigned short aprio, unsigned short bprio); #endif |