diff options
| author | Matthias Kaehlcke <matthias.kaehlcke@gmail.com> | 2007-07-10 12:26:24 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-07-10 13:43:32 +0200 |
| commit | 70cee26e020c1d74ff559c991b96c7b19fa4173b (patch) | |
| tree | a2d73f170c8d7db29eaca27dbc06b6c6218a8f55 /block/elevator.c | |
| parent | fd11d171e51a5b81c176d856d5df5612117e1a45 (diff) | |
| download | linux-stable-70cee26e020c1d74ff559c991b96c7b19fa4173b.tar.gz linux-stable-70cee26e020c1d74ff559c991b96c7b19fa4173b.tar.bz2 linux-stable-70cee26e020c1d74ff559c991b96c7b19fa4173b.zip | |
Use list_for_each_entry() instead of list_for_each() in the block device
elevator
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/block/elevator.c b/block/elevator.c index ce866eb75f6a..4769a25d7037 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -112,12 +112,8 @@ static inline int elv_try_merge(struct request *__rq, struct bio *bio) static struct elevator_type *elevator_find(const char *name) { struct elevator_type *e; - struct list_head *entry; - - list_for_each(entry, &elv_list) { - - e = list_entry(entry, struct elevator_type, list); + list_for_each_entry(e, &elv_list, list) { if (!strcmp(e->elevator_name, name)) return e; } @@ -1116,14 +1112,11 @@ ssize_t elv_iosched_show(request_queue_t *q, char *name) { elevator_t *e = q->elevator; struct elevator_type *elv = e->elevator_type; - struct list_head *entry; + struct elevator_type *__e; int len = 0; spin_lock(&elv_list_lock); - list_for_each(entry, &elv_list) { - struct elevator_type *__e; - - __e = list_entry(entry, struct elevator_type, list); + list_for_each_entry(__e, &elv_list, list) { if (!strcmp(elv->elevator_name, __e->elevator_name)) len += sprintf(name+len, "[%s] ", elv->elevator_name); else |