aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
Diffstat (limited to 'block')
-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 {
115 unsigned int cfq_slice_idle; 115 unsigned int cfq_slice_idle;
116 116
117 struct list_head cic_list; 117 struct list_head cic_list;
118
119 sector_t new_seek_mean;
120 u64 new_seek_total;
121}; 118};
122 119
123/* 120/*
@@ -157,8 +154,6 @@ struct cfq_queue {
157 154
158 /* various state flags, see below */ 155 /* various state flags, see below */
159 unsigned int flags; 156 unsigned int flags;
160
161 sector_t last_request_pos;
162}; 157};
163 158
164enum cfqq_state_flags { 159enum cfqq_state_flags {
@@ -1621,11 +1616,6 @@ cfq_update_io_seektime(struct cfq_data *cfqd, struct cfq_io_context *cic,
1621 else 1616 else
1622 sdist = cic->last_request_pos - rq->sector; 1617 sdist = cic->last_request_pos - rq->sector;
1623 1618
1624 if (!cic->seek_samples) {
1625 cfqd->new_seek_total = (7*cic->seek_total + (u64)256*sdist) / 8;
1626 cfqd->new_seek_mean = cfqd->new_seek_total / 256;
1627 }
1628
1629 /* 1619 /*
1630 * Don't allow the seek distance to get too large from the 1620 * Don't allow the seek distance to get too large from the
1631 * odd fragment, pagein, etc 1621 * odd fragment, pagein, etc
@@ -1761,7 +1751,6 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq,
1761 cfq_update_idle_window(cfqd, cfqq, cic); 1751 cfq_update_idle_window(cfqd, cfqq, cic);
1762 1752
1763 cic->last_request_pos = rq->sector + rq->nr_sectors; 1753 cic->last_request_pos = rq->sector + rq->nr_sectors;
1764 cfqq->last_request_pos = cic->last_request_pos;
1765 1754
1766 if (cfqq == cfqd->active_queue) { 1755 if (cfqq == cfqd->active_queue) {
1767 /* 1756 /*