diff options
author | Elias Oltmanns <eo@nebensachen.de> | 2008-10-01 10:02:33 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2008-10-09 02:56:20 -0400 |
commit | 336c3d8ce771608815b65bcfa27a17a83b297328 (patch) | |
tree | 91841449cf24ee051ff1daefcb60a8fbefe2522a /block | |
parent | c0ddffa84a7d12da9943a94d04dadbfb1883b904 (diff) |
block: Fix blk_start_queueing() to not kick a stopped queue
blk_start_queueing() should act like the generic queue unplugging
and kicking and ignore a stopped queue. Such a queue may not be
run until after a call to blk_start_queue().
Signed-off-by: Elias Oltmanns <eo@nebensachen.de>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/blk-core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index fa212348c4c9..c66333d8e48d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -890,9 +890,11 @@ EXPORT_SYMBOL(blk_get_request); | |||
890 | */ | 890 | */ |
891 | void blk_start_queueing(struct request_queue *q) | 891 | void blk_start_queueing(struct request_queue *q) |
892 | { | 892 | { |
893 | if (!blk_queue_plugged(q)) | 893 | if (!blk_queue_plugged(q)) { |
894 | if (unlikely(blk_queue_stopped(q))) | ||
895 | return; | ||
894 | q->request_fn(q); | 896 | q->request_fn(q); |
895 | else | 897 | } else |
896 | __generic_unplug_device(q); | 898 | __generic_unplug_device(q); |
897 | } | 899 | } |
898 | EXPORT_SYMBOL(blk_start_queueing); | 900 | EXPORT_SYMBOL(blk_start_queueing); |