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

Commit 4736346b authored by Geliang Tang's avatar Geliang Tang Committed by Jens Axboe
Browse files

elevator: use list_{first,prev,next}_entry 



To make the intention clearer, use list_{first,prev,next}_entry
instead of list_entry.

Signed-off-by: default avatarGeliang Tang <geliangtang@163.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent d09f9581

block/noop-iosched.c

+5 −5
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ static void noop_merged_requests(struct request_queue *q, struct request *rq, 
static int noop_dispatch(struct request_queue *q, int force)

{

	struct noop_data *nd = q->elevator->elevator_data;



	if (!list_empty(&nd->queue)) {

	struct request *rq;

		rq = list_entry(nd->queue.next, struct request, queuelist);



	rq = list_first_entry_or_null(&nd->queue, struct request, queuelist);

	if (rq) {

		list_del_init(&rq->queuelist);

		elv_dispatch_sort(q, rq);

		return 1;
@@ -46,7 +46,7 @@ noop_former_request(struct request_queue *q, struct request *rq) 


	if (rq->queuelist.prev == &nd->queue)

		return NULL;

	return list_entry(rq->queuelist.prev, struct request, queuelist);

	return list_prev_entry(rq, queuelist);

}



static struct request *
@@ -56,7 +56,7 @@ noop_latter_request(struct request_queue *q, struct request *rq) 


	if (rq->queuelist.next == &nd->queue)

		return NULL;

	return list_entry(rq->queuelist.next, struct request, queuelist);

	return list_next_entry(rq, queuelist);

}



static int noop_init_queue(struct request_queue *q, struct elevator_type *e)