summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-03-25 18:58:59 +0300
committerJens Axboe <jaxboe@fusionio.com>2011-03-25 19:04:08 +0300
commitad3d9d7ede04a9c71be7a9fe1a23961817f371f7 (patch)
tree33b0eded3b689020529cf8c0d4febf956ff10140 /block
parent401a18e92ce32cd0ddfa5738899ca2b8114f2bbf (diff)
downloadlinux-ad3d9d7ede04a9c71be7a9fe1a23961817f371f7.tar.xz
block: fix issue with calling blk_stop_queue() from the request_fn handler
When the queue work handler was converted to delayed work, the stopping was inadvertently made sync as well. Change this back to being async stop, using __cancel_delayed_work() instead of cancel_delayed_work(). Reported-by: Jeremy Fitzhardinge <jeremy@goop.org> Reported-by: Chris Mason <chris.mason@oracle.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 64e96ee1d6af..e0a062363937 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -271,7 +271,7 @@ EXPORT_SYMBOL(blk_start_queue);
**/
void blk_stop_queue(struct request_queue *q)
{
- cancel_delayed_work(&q->delay_work);
+ __cancel_delayed_work(&q->delay_work);
queue_flag_set(QUEUE_FLAG_STOPPED, q);
}
EXPORT_SYMBOL(blk_stop_queue);