OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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: Geliang Tang <geliangtang@163.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Geliang Tang 2015-11-16 23:30:00 +08:00 committed by Jens Axboe
parent d09f9581b2
commit 4736346bb4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/noop-iosched.c
View File

@ -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) static int noop_dispatch(struct request_queue *q, int force)
{ {
struct noop_data *nd = q->elevator->elevator_data; struct noop_data *nd = q->elevator->elevator_data;
struct request *rq;
if (!list_empty(&nd->queue)) { rq = list_first_entry_or_null(&nd->queue, struct request, queuelist);
struct request *rq; if (rq) {
rq = list_entry(nd->queue.next, struct request, queuelist);
list_del_init(&rq->queuelist); list_del_init(&rq->queuelist);
elv_dispatch_sort(q, rq); elv_dispatch_sort(q, rq);
return 1; return 1;
@ -46,7 +46,7 @@ noop_former_request(struct request_queue *q, struct request *rq)
if (rq->queuelist.prev == &nd->queue) if (rq->queuelist.prev == &nd->queue)
return NULL; return NULL;
return list_entry(rq->queuelist.prev, struct request, queuelist); return list_prev_entry(rq, queuelist);
} }
static struct request * static struct request *
@ -56,7 +56,7 @@ noop_latter_request(struct request_queue *q, struct request *rq)
if (rq->queuelist.next == &nd->queue) if (rq->queuelist.next == &nd->queue)
return NULL; 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) static int noop_init_queue(struct request_queue *q, struct elevator_type *e)