aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2010-05-24 09:07:32 +0200
committerJens Axboe <jens.axboe@oracle.com>2010-05-24 09:07:32 +0200
commite36f724b4ae70e443a7d152929b60059cbfa1a26 (patch)
tree9eed1cf285d4693c1e239315f629a1a7a81df4e9 /block
parent80b15c7389caa81a3860f9fc2ee47ec0ea572a63 (diff)
downloadmrst-s0i3-test-e36f724b4ae70e443a7d152929b60059cbfa1a26.tar.gz
mrst-s0i3-test-e36f724b4ae70e443a7d152929b60059cbfa1a26.tar.xz
mrst-s0i3-test-e36f724b4ae70e443a7d152929b60059cbfa1a26.zip
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')
-rw-r--r--block/elevator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 6df2b5056b5..0abce473d60 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;