commit dddb74519aec2081204d203a97578c9fc4e9fb64
author Corrado Zoccolo <czoccolo@gmail.com> Mon Nov 02 10:40:37 2009 +0100
committer Jens Axboe <jens.axboe@oracle.com> Mon Nov 02 10:40:37 2009 +0100
tree 8737fb08028c1d0bbf01775704a7dc41501bbf71
parent ab0a9735e06914ce4d2a94ffa41497dbc142fe7f

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>

block/cfq-iosched.c

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 418da9a..757010d 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -2359,12 +2359,10 @@
 			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;
 	}
 }