X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=block%2Fblk-core.c;h=1378d084c770f6641a911caf8d98d302026fa689;hb=fdcee305c08a27c8d5d2d03eb5b2656ac3e4a0cc;hp=9ee32f85d74e1a8042b40c1b3eca31fa6122b412;hpb=18e2befaf6c2a2b877a8842f8caa7bce54d9b59b;p=linux-2.6-microblaze.git

diff --git a/block/blk-core.c b/block/blk-core.c
index 9ee32f85d74e..1378d084c770 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -363,8 +363,10 @@ void blk_cleanup_queue(struct request_queue *q)
 	blk_queue_flag_set(QUEUE_FLAG_DEAD, q);
 
 	blk_sync_queue(q);
-	if (queue_is_mq(q))
+	if (queue_is_mq(q)) {
+		blk_mq_cancel_work_sync(q);
 		blk_mq_exit_queue(q);
+	}
 
 	/*
 	 * In theory, request pool of sched_tags belongs to request queue.
@@ -1015,6 +1017,7 @@ EXPORT_SYMBOL(submit_bio);
 /**
  * bio_poll - poll for BIO completions
  * @bio: bio to poll for
+ * @iob: batches of IO
  * @flags: BLK_POLL_* flags that control the behavior
  *
  * Poll for completions on queue associated with the bio. Returns number of