cfq-iosched: simplify prio-unboost code

Eliminate redundant checks.

Signed-off-by: Corrado Zoccolo <czoccolo@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 418da9a49bb011a241098e65f4ff90343854788b..757010d8fb7a55b3c423d1594abeb1cfd27d59b3 100644 (file)
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2359,12 +2359,10 @@ static void cfq_prio_boost(struct cfq_queue *cfqq)
                        cfqq->ioprio = IOPRIO_NORM;
        } else {
                /*
-                * check if we need to unboost the queue
+                * unboost the queue (if needed)
                 */
-               if (cfqq->ioprio_class != cfqq->org_ioprio_class)
-                       cfqq->ioprio_class = cfqq->org_ioprio_class;
-               if (cfqq->ioprio != cfqq->org_ioprio)
-                       cfqq->ioprio = cfqq->org_ioprio;
+               cfqq->ioprio_class = cfqq->org_ioprio_class;
+               cfqq->ioprio = cfqq->org_ioprio;
        }
 }