diff options
Diffstat (limited to 'block')
-rw-r--r-- | block/cfq-iosched.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index ef2f72d42434..8447fde95501 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -122,7 +122,6 @@ struct cfq_data { | |||
122 | struct cfq_queue *async_idle_cfqq; | 122 | struct cfq_queue *async_idle_cfqq; |
123 | 123 | ||
124 | sector_t last_position; | 124 | sector_t last_position; |
125 | unsigned long last_end_request; | ||
126 | 125 | ||
127 | /* | 126 | /* |
128 | * tunables, see top of file | 127 | * tunables, see top of file |
@@ -2164,9 +2163,6 @@ static void cfq_completed_request(struct request_queue *q, struct request *rq) | |||
2164 | if (cfq_cfqq_sync(cfqq)) | 2163 | if (cfq_cfqq_sync(cfqq)) |
2165 | cfqd->sync_flight--; | 2164 | cfqd->sync_flight--; |
2166 | 2165 | ||
2167 | if (!cfq_class_idle(cfqq)) | ||
2168 | cfqd->last_end_request = now; | ||
2169 | |||
2170 | if (sync) | 2166 | if (sync) |
2171 | RQ_CIC(rq)->last_end_request = now; | 2167 | RQ_CIC(rq)->last_end_request = now; |
2172 | 2168 | ||
@@ -2479,7 +2475,6 @@ static void *cfq_init_queue(struct request_queue *q) | |||
2479 | 2475 | ||
2480 | INIT_WORK(&cfqd->unplug_work, cfq_kick_queue); | 2476 | INIT_WORK(&cfqd->unplug_work, cfq_kick_queue); |
2481 | 2477 | ||
2482 | cfqd->last_end_request = jiffies; | ||
2483 | cfqd->cfq_quantum = cfq_quantum; | 2478 | cfqd->cfq_quantum = cfq_quantum; |
2484 | cfqd->cfq_fifo_expire[0] = cfq_fifo_expire[0]; | 2479 | cfqd->cfq_fifo_expire[0] = cfq_fifo_expire[0]; |
2485 | cfqd->cfq_fifo_expire[1] = cfq_fifo_expire[1]; | 2480 | cfqd->cfq_fifo_expire[1] = cfq_fifo_expire[1]; |