diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-11-23 19:59:22 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-11-23 19:59:22 -0500 |
| commit | 3183b5124f9c111beae69ccfb25ed77f1b9ca31a (patch) | |
| tree | d055e63c078afab34735a13bbbec3c7d2a7a3edf /fs/ioprio.c | |
| parent | f652d979c206de8fe7e223f5bcd549dc8f663550 (diff) | |
| parent | 2dc2565902d3c24108c4b7101e91957fd068a242 (diff) | |
Merge tag 'v3.14.25' into v3.14-rt
This is the 3.14.25 stable release
Conflicts:
include/linux/radix-tree.h
kernel/rcu/tree.c
mm/filemap.c
mm/page_alloc.c
Diffstat (limited to 'fs/ioprio.c')
| -rw-r--r-- | fs/ioprio.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/ioprio.c b/fs/ioprio.c index e50170ca7c33..31666c92b46a 100644 --- a/fs/ioprio.c +++ b/fs/ioprio.c @@ -157,14 +157,16 @@ out: int ioprio_best(unsigned short aprio, unsigned short bprio) { - unsigned short aclass = IOPRIO_PRIO_CLASS(aprio); - unsigned short bclass = IOPRIO_PRIO_CLASS(bprio); + unsigned short aclass; + unsigned short bclass; - if (aclass == IOPRIO_CLASS_NONE) - aclass = IOPRIO_CLASS_BE; - if (bclass == IOPRIO_CLASS_NONE) - bclass = IOPRIO_CLASS_BE; + if (!ioprio_valid(aprio)) + aprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, IOPRIO_NORM); + if (!ioprio_valid(bprio)) + bprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, IOPRIO_NORM); + aclass = IOPRIO_PRIO_CLASS(aprio); + bclass = IOPRIO_PRIO_CLASS(bprio); if (aclass == bclass) return min(aprio, bprio); if (aclass > bclass) |