diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-21 10:24:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-21 10:24:02 -0700 |
| commit | ae298c98e5ab5bab3b39ffe0c2aebfeb4b1e68a2 (patch) | |
| tree | c7d5775c294b98301fdc726395dfb37d9878461d /include/linux | |
| parent | da547d775fa9ba8d9dcaee7bc4e960540e2be576 (diff) | |
| parent | be33c3a67bb717508ab1eab0f2fa570fabcbc4d2 (diff) | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ioprio.h | 23 |
1 files changed, 1 insertions, 22 deletions
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 |