diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2010-05-24 09:07:32 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-05-24 09:07:32 +0200 |
| commit | e36f724b4ae70e443a7d152929b60059cbfa1a26 (patch) | |
| tree | 9eed1cf285d4693c1e239315f629a1a7a81df4e9 /block/elevator.c | |
| parent | 80b15c7389caa81a3860f9fc2ee47ec0ea572a63 (diff) | |
| download | op-kernel-dev-e36f724b4ae70e443a7d152929b60059cbfa1a26.zip op-kernel-dev-e36f724b4ae70e443a7d152929b60059cbfa1a26.tar.gz | |
block: Adjust elv_iosched_show to return "none" for bio-based DM
Bio-based DM doesn't use an elevator (queue is !blk_queue_stackable()).
Longer-term DM will not allocate an elevator for bio-based DM. But even
then there will be small potential for an elevator to be allocated for
a request-based DM table only to have a bio-based table be loaded in the
end.
Displaying "none" for bio-based DM will help avoid user confusion.
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/elevator.c b/block/elevator.c index 6df2b50..0abce47 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -1097,7 +1097,7 @@ ssize_t elv_iosched_show(struct request_queue *q, char *name) struct elevator_type *__e; int len = 0; - if (!q->elevator) + if (!q->elevator || !blk_queue_stackable(q)) return sprintf(name, "none\n"); elv = e->elevator_type; |
