---

yaml --- r: 13999 b: refs/heads/master c: b740d98 h: refs/heads/master i: 13997: 59d327a 13995: 1100a0c 13991: 62659b7 13983: 9a25a05 v: v3
git-mirror · Nov 12, 2005 · c7a6583 · c7a6583
1 parent cea37d1
commit c7a6583
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be56123568072d223263a6a70a087d1e7faabb83
+refs/heads/master: b740d98f5614e34b4cff2e1e67826f007c8d4f30
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -861,8 +861,8 @@ __cfq_slice_expired(struct cfq_data *cfqd, struct cfq_queue *cfqq,
 	 * store what was left of this slice, if the queue idled out
 	 * or was preempted
 	 */
-	if (time_after(now, cfqq->slice_end))
-		cfqq->slice_left = now - cfqq->slice_end;
+	if (time_after(cfqq->slice_end, now))
+		cfqq->slice_left = cfqq->slice_end - now;
 	else
 		cfqq->slice_left = 0;