From fea691dd50298f0e3b4bb6ba913a65db3f307fed Mon Sep 17 00:00:00 2001
From: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Date: Tue, 10 Jul 2007 12:26:24 +0200
Subject: [PATCH] --- yaml --- r: 58514 b: refs/heads/master c:
 70cee26e020c1d74ff559c991b96c7b19fa4173b h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/block/elevator.c | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 982700ff82bd..15727e89b3a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd11d171e51a5b81c176d856d5df5612117e1a45
+refs/heads/master: 70cee26e020c1d74ff559c991b96c7b19fa4173b
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index ce866eb75f6a..4769a25d7037 100644
--- a/trunk/block/elevator.c
+++ b/trunk/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