aboutsummaryrefslogtreecommitdiffstats
path: root/block/elevator.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2005-11-10 18:22:36 +0100
committerJens Axboe <axboe@nelson.home.kernel.dk>2005-11-12 10:57:05 +0100
commit3beb2077125d8457118140653e75efc998ac6630 (patch)
tree130dd33c810471790554d21eab32f5f859715fd7 /block/elevator.c
parent5a7c47eefb31f6b4982add7473ef3e551b058ea4 (diff)
downloadmrst-s0i3-test-3beb2077125d8457118140653e75efc998ac6630.tar.gz
mrst-s0i3-test-3beb2077125d8457118140653e75efc998ac6630.tar.xz
mrst-s0i3-test-3beb2077125d8457118140653e75efc998ac6630.zip
[BLOCK] elevator: elv_latter/former_request update
With generic dispatch queue update, implicit former/latter request handling using rq->queuelist.prev/next doesn't work as expected anymore. Also, the only iosched dependent on this feature was noop-iosched and it has been reimplemented to have its own latter/former methods. This patch removes implicit former/latter handling. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'block/elevator.c')
-rw-r--r--block/elevator.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/block/elevator.c b/block/elevator.c
index cacfff7418e..e4c58827bb4 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -541,33 +541,19 @@ int elv_queue_empty(request_queue_t *q)
struct request *elv_latter_request(request_queue_t *q, struct request *rq)
{
- struct list_head *next;
-
elevator_t *e = q->elevator;
if (e->ops->elevator_latter_req_fn)
return e->ops->elevator_latter_req_fn(q, rq);
-
- next = rq->queuelist.next;
- if (next != &q->queue_head && next != &rq->queuelist)
- return list_entry_rq(next);
-
return NULL;
}
struct request *elv_former_request(request_queue_t *q, struct request *rq)
{
- struct list_head *prev;
-
elevator_t *e = q->elevator;
if (e->ops->elevator_former_req_fn)
return e->ops->elevator_former_req_fn(q, rq);
-
- prev = rq->queuelist.prev;
- if (prev != &q->queue_head && prev != &rq->queuelist)
- return list_entry_rq(prev);
-
return NULL;
}