X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=block%2Fcfq-iosched.c;h=9e809345f71abd718cecc27f6fd4ea068ed4775c;hb=718f041835f383780fd45b8424fffa586be6e1f7;hp=664ebfd092ec21f95cedc56b6a5259874db0399c;hpb=41480ae7a383dcffa497decdd97b3cb2caaa18ec;p=linux-2.6-omap-h63xx.git

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 664ebfd092e..9e809345f71 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1992,8 +1992,10 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq)
 		}
 		if (cfq_slice_used(cfqq) || cfq_class_idle(cfqq))
 			cfq_slice_expired(cfqd, 1);
-		else if (sync && RB_EMPTY_ROOT(&cfqq->sort_list))
+		else if (sync && !rq_noidle(rq) &&
+			 RB_EMPTY_ROOT(&cfqq->sort_list)) {
 			cfq_arm_slice_timer(cfqd);
+		}
 	}
 
 	if (!cfqd->rq_in_driver)