adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] uninline ioprio_best()

Browse source 
Saves 376 bytes (5 callers) for me.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Jens Axboe <axboe@suse.de>
This commit is contained in:
Oleg Nesterov 2006-08-21 10:02:50 +02:00 committed by Jens Axboe
parent 9f83e45eb5
commit e014ff8d42
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
fs/ioprio.c
View file

@ -140,6 +140,29 @@ out:
return ret; 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) asmlinkage long sys_ioprio_get(int which, int who)
{ {
struct task_struct *g, *p; struct task_struct *g, *p;

23
include/linux/ioprio.h
View file

@ -59,27 +59,6 @@ static inline int task_nice_ioprio(struct task_struct *task)
/* /*
* For inheritance, return the highest of the two given priorities * For inheritance, return the highest of the two given priorities
*/ */
static inline int ioprio_best(unsigned short aprio, unsigned short bprio) extern 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;
}
#endif #endif