diff options
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r-- | block/cfq-iosched.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 1d9c3c70a9a0..e9019ed39b73 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -1464,8 +1464,7 @@ cfq_update_io_thinktime(struct cfq_data *cfqd, struct cfq_io_context *cic) | |||
1464 | } | 1464 | } |
1465 | 1465 | ||
1466 | static void | 1466 | static void |
1467 | cfq_update_io_seektime(struct cfq_data *cfqd, struct cfq_io_context *cic, | 1467 | cfq_update_io_seektime(struct cfq_io_context *cic, struct request *rq) |
1468 | struct request *rq) | ||
1469 | { | 1468 | { |
1470 | sector_t sdist; | 1469 | sector_t sdist; |
1471 | u64 total; | 1470 | u64 total; |
@@ -1617,7 +1616,7 @@ cfq_rq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq, | |||
1617 | } | 1616 | } |
1618 | 1617 | ||
1619 | cfq_update_io_thinktime(cfqd, cic); | 1618 | cfq_update_io_thinktime(cfqd, cic); |
1620 | cfq_update_io_seektime(cfqd, cic, rq); | 1619 | cfq_update_io_seektime(cic, rq); |
1621 | cfq_update_idle_window(cfqd, cfqq, cic); | 1620 | cfq_update_idle_window(cfqd, cfqq, cic); |
1622 | 1621 | ||
1623 | cic->last_queue = jiffies; | 1622 | cic->last_queue = jiffies; |
@@ -1770,7 +1769,7 @@ static int cfq_may_queue(request_queue_t *q, int rw) | |||
1770 | /* | 1769 | /* |
1771 | * queue lock held here | 1770 | * queue lock held here |
1772 | */ | 1771 | */ |
1773 | static void cfq_put_request(request_queue_t *q, struct request *rq) | 1772 | static void cfq_put_request(struct request *rq) |
1774 | { | 1773 | { |
1775 | struct cfq_queue *cfqq = RQ_CFQQ(rq); | 1774 | struct cfq_queue *cfqq = RQ_CFQQ(rq); |
1776 | 1775 | ||
@@ -1951,7 +1950,7 @@ static void cfq_exit_queue(elevator_t *e) | |||
1951 | kfree(cfqd); | 1950 | kfree(cfqd); |
1952 | } | 1951 | } |
1953 | 1952 | ||
1954 | static void *cfq_init_queue(request_queue_t *q, elevator_t *e) | 1953 | static void *cfq_init_queue(request_queue_t *q) |
1955 | { | 1954 | { |
1956 | struct cfq_data *cfqd; | 1955 | struct cfq_data *cfqd; |
1957 | int i; | 1956 | int i; |