diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-04-19 14:01:28 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-19 17:38:36 -0600 |
| commit | 9a87182c4b69f7ca3ce764bbb4f72641e5a3b2b2 (patch) | |
| tree | a0121132c58f41bd3ea558e24fb0a7f5839373af | |
| parent | 0be0dee64eacd950f8e4b6c45adb5a92392eaaaf (diff) | |
| download | linux-stable-9a87182c4b69f7ca3ce764bbb4f72641e5a3b2b2.tar.gz linux-stable-9a87182c4b69f7ca3ce764bbb4f72641e5a3b2b2.tar.bz2 linux-stable-9a87182c4b69f7ca3ce764bbb4f72641e5a3b2b2.zip | |
block: Optimize ioprio_best()
Since ioprio_best() translates IOPRIO_CLASS_NONE into IOPRIO_CLASS_BE
and since lower numerical priority values represent a higher priority
a simple numerical comparison is sufficient.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Adam Manzanares <adam.manzanares@wdc.com>
Tested-by: Adam Manzanares <adam.manzanares@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | block/ioprio.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/block/ioprio.c b/block/ioprio.c index 0c47a00f92a8..4b120c9cf7e8 100644 --- a/block/ioprio.c +++ b/block/ioprio.c @@ -163,22 +163,12 @@ out: int ioprio_best(unsigned short aprio, unsigned short bprio) { - unsigned short aclass; - unsigned short bclass; - 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) - return bprio; - else - return aprio; + return min(aprio, bprio); } SYSCALL_DEFINE2(ioprio_get, int, which, int, who) |