From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Bart Van Assche To: Jens Axboe CC: , Bart Van Assche , Christoph Hellwig , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 5/5] block: Optimize ioprio_best() Date: Tue, 18 Apr 2017 16:10:37 -0700 Message-ID: <20170418231037.3968-6-bart.vanassche@sandisk.com> In-Reply-To: <20170418231037.3968-1-bart.vanassche@sandisk.com> References: <20170418231037.3968-1-bart.vanassche@sandisk.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-Path: Bart.VanAssche@sandisk.com List-ID: 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 Reviewed-by: Adam Manzanares Tested-by: Adam Manzanares Cc: Christoph Hellwig Cc: Matias Bjørling --- block/ioprio.c | 12 +----------- 1 file changed, 1 insertion(+), 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 @@ static int get_task_ioprio(struct task_struct *p) 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) -- 2.12.2