blk-mq: when polling for IO, look for any completion

[thirdparty/kernel/stable.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 04f5be4736385f6a4bed4c13adbba01c5656f95f..03c4202b69bf0057be334445d2e6ca1226abb0a4 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1273,10 +1273,19 @@ blk_qc_t submit_bio(struct bio *bio)
 }
 EXPORT_SYMBOL(submit_bio);
 
-bool blk_poll(struct request_queue *q, blk_qc_t cookie)
+/**
+ * blk_poll - poll for IO completions
+ * @q:  the queue
+ * @cookie: cookie passed back at IO submission time
+ *
+ * Description:
+ *    Poll for completions on the passed in queue. Returns number of
+ *    completed entries found.
+ */
+int blk_poll(struct request_queue *q, blk_qc_t cookie)
 {
        if (!q->poll_fn || !blk_qc_t_valid(cookie))
-               return false;
+               return 0;
 
        if (current->plug)
                blk_flush_plug_list(current->plug, false);