Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[~andy/linux] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index 0d2db536c6a759c9c16cb2e7d24abe6561d00a54..db3d0d8296a05c908f5dd38100593217c8c7d114 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -699,11 +699,12 @@ int elv_register_queue(struct request_queue *q)
 
        error = kobject_add(&e->kobj);
        if (!error) {
-               struct attribute **attr = e->elevator_type->elevator_attrs;
+               struct elv_fs_entry *attr = e->elevator_type->elevator_attrs;
                if (attr) {
-                       while (*attr) {
-                               if (sysfs_create_file(&e->kobj,*attr++))
+                       while (attr->attr.name) {
+                               if (sysfs_create_file(&e->kobj, &attr->attr))
                                        break;
+                               attr++;
                        }
                }
                kobject_uevent(&e->kobj, KOBJ_ADD);