Merge branch 'cfq-2.6.33' into for-2.6.33
[linux-2.6.git] / block / cfq-iosched.c
index aa00d8f..8b5ba18 100644 (file)
@@ -2625,12 +2625,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;
        }
 }