summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@sw.ru>2007-07-20 10:07:50 +0200
committerJens Axboe <jens.axboe@oracle.com>2007-07-20 10:07:50 +0200
commit8350163a90f6003c9e60e8ebc0e00f654657645f (patch)
tree8b6f2fe6c36e6b7e542530363f253a74cfc12e98
parentc2dea2d1fdbce86942dba0a968c523d8b7858bb5 (diff)
downloadlinux-stable-8350163a90f6003c9e60e8ebc0e00f654657645f.tar.gz
linux-stable-8350163a90f6003c9e60e8ebc0e00f654657645f.tar.bz2
linux-stable-8350163a90f6003c9e60e8ebc0e00f654657645f.zip
cfq: Write-only stuff in CFQ data structures
There are some leftover bits from the task cooperator patch, that was yanked out again. While it will get reintroduced, no point in having this write-only stuff in the tree. So yank it. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--block/cfq-iosched.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index bc7190eed10d..d148ccbc36d1 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -115,9 +115,6 @@ struct cfq_data {
unsigned int cfq_slice_idle;
struct list_head cic_list;
-
- sector_t new_seek_mean;
- u64 new_seek_total;
};
/*
@@ -157,8 +154,6 @@ struct cfq_queue {
/* various state flags, see below */
unsigned int flags;
-
- sector_t last_request_pos;
};
enum cfqq_state_flags {
@@ -1621,11 +1616,6 @@ cfq_update_io_seektime(struct cfq_data *cfqd, struct cfq_io_context *cic,
else
sdist = cic->last_request_pos - rq->sector;
- if (!cic->seek_samples) {
- cfqd->new_seek_total = (7*cic->seek_total + (u64)256*sdist) / 8;
- cfqd->new_seek_mean = cfqd->new_seek_total / 256;
- }
-
/*
* Don't allow the seek distance to get too large from the
* odd fragment, pagein, etc
@@ -1761,7 +1751,6 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
cfq_update_idle_window(cfqd, cfqq, cic);
cic->last_request_pos = rq->sector + rq->nr_sectors;
- cfqq->last_request_pos = cic->last_request_pos;
if (cfqq == cfqd->active_queue) {
/*