Commit 70cee26e authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Jens Axboe
Browse files

Use list_for_each_entry() instead of list_for_each() in the block device 



elevator

Signed-off-by: default avatarMatthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent fd11d171

block/elevator.c

+3 −10
Original line number Diff line number Diff line
@@ -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