x86: add uniq_ioapic_id to mpparse_32.c

[sfrench/cifs-2.6.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index bafbae0344d319e909e3e7add07467b1c0463a73..88318c383608defa5018bdfa929918c767c8d7fa 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -134,6 +134,21 @@ static struct elevator_type *elevator_get(const char *name)
        spin_lock(&elv_list_lock);
 
        e = elevator_find(name);
+       if (!e) {
+               char elv[ELV_NAME_MAX + strlen("-iosched")];
+
+               spin_unlock(&elv_list_lock);
+
+               if (!strcmp(name, "anticipatory"))
+                       sprintf(elv, "as-iosched");
+               else
+                       sprintf(elv, "%s-iosched", name);
+
+               request_module(elv);
+               spin_lock(&elv_list_lock);
+               e = elevator_find(name);
+       }
+
        if (e && !try_module_get(e->elevator_owner))
                e = NULL;