From c7a6583bd05848cfabacf6b5f606b6e7dbc4ee12 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 10 Nov 2005 18:20:16 +0100 Subject: [PATCH] --- yaml --- r: 13999 b: refs/heads/master c: b740d98f5614e34b4cff2e1e67826f007c8d4f30 h: refs/heads/master i: 13997: 59d327af197760c9212b5926c4d87ed1e2a31ab0 13995: 1100a0c2f5248b3b4492bd9931fde09776812de8 13991: 62659b772797f915fe62e7b47475ea27f50e522c 13983: 9a25a051899bedd7f5493c2ade8f57993f1572f7 v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c6352aa7b36..d4637008bf74 100644 --- 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 index 452538644bce..2b64f5852bfd 100644 --- 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;