Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3beb2077 authored by Tejun Heo's avatar Tejun Heo Committed by Jens Axboe
Browse files

[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: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
parent 5a7c47ee

block/elevator.c

+0 −14
Original line number Diff line number Diff line
@@ -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;

}