aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-01-19 11:30:16 +1100
committerJens Axboe <axboe@carl.home.kernel.dk>2007-02-11 23:14:44 +0100
commitaaf1228ddfb44f04c87d1e7dfc5ccffdba74363d (patch)
treefb57e223b97e52e78f88f87e7aefdb5a557985eb /block
parent783660b2f60418144e168ab75a06786f9695fc70 (diff)
downloadkernel_samsung_smdk4412-aaf1228ddfb44f04c87d1e7dfc5ccffdba74363d.zip
kernel_samsung_smdk4412-aaf1228ddfb44f04c87d1e7dfc5ccffdba74363d.tar.gz
kernel_samsung_smdk4412-aaf1228ddfb44f04c87d1e7dfc5ccffdba74363d.tar.bz2
cfq-iosched: remove cfq_io_context last_queue
It hasn't been used for a while, kill it off and remove the old if 0 code chunk. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 07b7062..a31066d 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1471,22 +1471,8 @@ err:
static void
cfq_update_io_thinktime(struct cfq_data *cfqd, struct cfq_io_context *cic)
{
- unsigned long elapsed, ttime;
-
- /*
- * if this context already has stuff queued, thinktime is from
- * last queue not last end
- */
-#if 0
- if (time_after(cic->last_end_request, cic->last_queue))
- elapsed = jiffies - cic->last_end_request;
- else
- elapsed = jiffies - cic->last_queue;
-#else
- elapsed = jiffies - cic->last_end_request;
-#endif
-
- ttime = min(elapsed, 2UL * cfqd->cfq_slice_idle);
+ unsigned long elapsed = jiffies - cic->last_end_request;
+ unsigned long ttime = min(elapsed, 2UL * cfqd->cfq_slice_idle);
cic->ttime_samples = (7*cic->ttime_samples + 256) / 8;
cic->ttime_total = (7*cic->ttime_total + 256*ttime) / 8;
@@ -1649,7 +1635,6 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
cfq_update_io_seektime(cic, rq);
cfq_update_idle_window(cfqd, cfqq, cic);
- cic->last_queue = jiffies;
cic->last_request_pos = rq->sector + rq->nr_sectors;
if (cfqq == cfqd->active_queue) {