From b38f037d49d93616523ab7ab41c01e22f0194c77 Mon Sep 17 00:00:00 2001
From: Corrado Zoccolo <czoccolo@gmail.com>
Date: Mon, 2 Nov 2009 10:40:37 +0100
Subject: [PATCH] --- yaml --- r: 172921 b: refs/heads/master c:
 dddb74519aec2081204d203a97578c9fc4e9fb64 h: refs/heads/master i:   172919:
 a98259fc22eb95eebafb5022fc0ecfd28e58c3a6 v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9934d5be2014..578e24348184 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab0a9735e06914ce4d2a94ffa41497dbc142fe7f
+refs/heads/master: dddb74519aec2081204d203a97578c9fc4e9fb64
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 418da9a49bb0..757010d8fb7a 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/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;
 	}
 }