Commit 3beb2077125d8457118140653e75efc998ac6630
Committed by
Jens Axboe
Jens Axboe
1 parent
5a7c47eefb
Exists in
master
and in
4 other branches
[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>
Showing 1 changed file with 0 additions and 14 deletions Side-by-side Diff
block/elevator.c
| ... | ... | @@ -541,33 +541,19 @@ |
| 541 | 541 | |
| 542 | 542 | struct request *elv_latter_request(request_queue_t *q, struct request *rq) |
| 543 | 543 | { |
| 544 | - struct list_head *next; | |
| 545 | - | |
| 546 | 544 | elevator_t *e = q->elevator; |
| 547 | 545 | |
| 548 | 546 | if (e->ops->elevator_latter_req_fn) |
| 549 | 547 | return e->ops->elevator_latter_req_fn(q, rq); |
| 550 | - | |
| 551 | - next = rq->queuelist.next; | |
| 552 | - if (next != &q->queue_head && next != &rq->queuelist) | |
| 553 | - return list_entry_rq(next); | |
| 554 | - | |
| 555 | 548 | return NULL; |
| 556 | 549 | } |
| 557 | 550 | |
| 558 | 551 | struct request *elv_former_request(request_queue_t *q, struct request *rq) |
| 559 | 552 | { |
| 560 | - struct list_head *prev; | |
| 561 | - | |
| 562 | 553 | elevator_t *e = q->elevator; |
| 563 | 554 | |
| 564 | 555 | if (e->ops->elevator_former_req_fn) |
| 565 | 556 | return e->ops->elevator_former_req_fn(q, rq); |
| 566 | - | |
| 567 | - prev = rq->queuelist.prev; | |
| 568 | - if (prev != &q->queue_head && prev != &rq->queuelist) | |
| 569 | - return list_entry_rq(prev); | |
| 570 | - | |
| 571 | 557 | return NULL; |
| 572 | 558 | } |
| 573 | 559 |