Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[karo-tx-linux.git] / block / blk-timeout.c

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 4d448259e622a7a9c36f2557af22fc600db4afaf..56c025894cdf2d73f78c5346c9c5987d5deb0e37 100644 (file)
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -7,6 +7,7 @@
 #include <linux/fault-inject.h>
 
 #include "blk.h"
+#include "blk-mq.h"
 
 #ifdef CONFIG_FAIL_IO_TIMEOUT
 
@@ -158,7 +159,10 @@ void blk_abort_request(struct request *req)
        if (blk_mark_rq_complete(req))
                return;
        blk_delete_timer(req);
-       blk_rq_timed_out(req);
+       if (req->q->mq_ops)
+               blk_mq_rq_timed_out(req, false);
+       else
+               blk_rq_timed_out(req);
 }
 EXPORT_SYMBOL_GPL(blk_abort_request);
 
@@ -186,7 +190,8 @@ void blk_add_timer(struct request *req)
        struct request_queue *q = req->q;
        unsigned long expiry;
 
-       if (!q->rq_timed_out_fn)
+       /* blk-mq has its own handler, so we don't need ->rq_timed_out_fn */
+       if (!q->mq_ops && !q->rq_timed_out_fn)
                return;
 
        BUG_ON(!list_empty(&req->timeout_list));