[PATCH] fix rmmod problems with elevator attributes, clean them up

1 files changed, 4 insertions, 3 deletions

diff --git a/block/elevator.c b/block/elevator.c
index 0d2db536c6a7..db3d0d8296a0 100644
--- 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);