diff --git a/[refs] b/[refs] index 21ac4118759c..1f9277be23ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2389d1ef172fc9df01f58265a436919d233fbc27 +refs/heads/master: b70c864d3ce706571d2f3cac1d35d4fba01d6072 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 61a3f22eee29..6831a758d541 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -2126,6 +2126,7 @@ static void *cfq_init_queue(struct request_queue *q) INIT_WORK(&cfqd->unplug_work, cfq_kick_queue); + cfqd->last_end_request = jiffies; cfqd->cfq_quantum = cfq_quantum; cfqd->cfq_fifo_expire[0] = cfq_fifo_expire[0]; cfqd->cfq_fifo_expire[1] = cfq_fifo_expire[1];