block: exit elv_iosched_show early when I/O schedulers are not supported

[linux-2.6-block.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index 9793af0a75a7d8ef6e2dd29c43bf6f34158a4f86..fa58905e6b3e9638135a2fb5515e6449d3af47fd 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -783,7 +783,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)
        struct elevator_type *__e;
        int len = 0;
 
-       if (!queue_is_mq(q))
+       if (!elv_support_iosched(q))
                return sprintf(name, "none\n");
 
        if (!q->elevator)
@@ -797,8 +797,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name)
                        len += sprintf(name+len, "[%s] ", elv->elevator_name);
                        continue;
                }
-               if (elv_support_iosched(q) &&
-                   elevator_match(__e, __e->elevator_name,
+               if (elevator_match(__e, __e->elevator_name,
                                   q->required_elevator_features))
                        len += sprintf(name+len, "%s ", __e->elevator_name);
        }