Merge tag 'pm+acpi-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-drm-fsl-dcu.git] / block / blk-timeout.c

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 65f103563969bf32391c7bb3d6f4e4859ed1459a..bba81c9348e1cca630fc9d2515f27633d997c03a 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
 
@@ -31,7 +32,7 @@ static int __init fail_io_timeout_debugfs(void)
        struct dentry *dir = fault_create_debugfs_attr("fail_io_timeout",
                                                NULL, &fail_io_timeout);
 
-       return IS_ERR(dir) ? PTR_ERR(dir) : 0;
+       return PTR_ERR_OR_ZERO(dir);
 }
 
 late_initcall(fail_io_timeout_debugfs);
@@ -88,11 +89,19 @@ static void blk_rq_timed_out(struct request *req)
                ret = q->rq_timed_out_fn(req);
        switch (ret) {
        case BLK_EH_HANDLED:
-               __blk_complete_request(req);
+               /* Can we use req->errors here? */
+               if (q->mq_ops)
+                       blk_mq_complete_request(req, req->errors);
+               else
+                       __blk_complete_request(req);
                break;
        case BLK_EH_RESET_TIMER:
+               if (q->mq_ops)
+                       blk_mq_add_timer(req);
+               else
+                       blk_add_timer(req);
+
                blk_clear_rq_complete(req);
-               blk_add_timer(req);
                break;
        case BLK_EH_NOT_HANDLED:
                /*
@@ -108,6 +117,23 @@ static void blk_rq_timed_out(struct request *req)
        }
 }
 
+void blk_rq_check_expired(struct request *rq, unsigned long *next_timeout,
+                         unsigned int *next_set)
+{
+       if (time_after_eq(jiffies, rq->deadline)) {
+               list_del_init(&rq->timeout_list);
+
+               /*
+                * Check if we raced with end io completion
+                */
+               if (!blk_mark_rq_complete(rq))
+                       blk_rq_timed_out(rq);
+       } else if (!*next_set || time_after(*next_timeout, rq->deadline)) {
+               *next_timeout = rq->deadline;
+               *next_set = 1;
+       }
+}
+
 void blk_rq_timed_out_timer(unsigned long data)
 {
        struct request_queue *q = (struct request_queue *) data;
@@ -117,21 +143,8 @@ void blk_rq_timed_out_timer(unsigned long data)
 
        spin_lock_irqsave(q->queue_lock, flags);
 
-       list_for_each_entry_safe(rq, tmp, &q->timeout_list, timeout_list) {
-               if (time_after_eq(jiffies, rq->deadline)) {
-                       list_del_init(&rq->timeout_list);
-
-                       /*
-                        * Check if we raced with end io completion
-                        */
-                       if (blk_mark_rq_complete(rq))
-                               continue;
-                       blk_rq_timed_out(rq);
-               } else if (!next_set || time_after(next, rq->deadline)) {
-                       next = rq->deadline;
-                       next_set = 1;
-               }
-       }
+       list_for_each_entry_safe(rq, tmp, &q->timeout_list, timeout_list)
+               blk_rq_check_expired(rq, &next, &next_set);
 
        if (next_set)
                mod_timer(&q->timeout, round_jiffies_up(next));
@@ -157,15 +170,7 @@ void blk_abort_request(struct request *req)
 }
 EXPORT_SYMBOL_GPL(blk_abort_request);
 
-/**
- * blk_add_timer - Start timeout timer for a single request
- * @req:       request that is about to start running.
- *
- * Notes:
- *    Each request has its own timer, and as it is added to the queue, we
- *    set up the timer. When the request completes, we cancel the timer.
- */
-void blk_add_timer(struct request *req)
+void __blk_add_timer(struct request *req, struct list_head *timeout_list)
 {
        struct request_queue *q = req->q;
        unsigned long expiry;
@@ -174,7 +179,6 @@ void blk_add_timer(struct request *req)
                return;
 
        BUG_ON(!list_empty(&req->timeout_list));
-       BUG_ON(test_bit(REQ_ATOM_COMPLETE, &req->atomic_flags));
 
        /*
         * Some LLDs, like scsi, peek at the timeout to prevent a
@@ -184,7 +188,8 @@ void blk_add_timer(struct request *req)
                req->timeout = q->rq_timeout;
 
        req->deadline = jiffies + req->timeout;
-       list_add_tail(&req->timeout_list, &q->timeout_list);
+       if (timeout_list)
+               list_add_tail(&req->timeout_list, timeout_list);
 
        /*
         * If the timer isn't already pending or this timeout is earlier
@@ -196,5 +201,19 @@ void blk_add_timer(struct request *req)
        if (!timer_pending(&q->timeout) ||
            time_before(expiry, q->timeout.expires))
                mod_timer(&q->timeout, expiry);
+
+}
+
+/**
+ * blk_add_timer - Start timeout timer for a single request
+ * @req:       request that is about to start running.
+ *
+ * Notes:
+ *    Each request has its own timer, and as it is added to the queue, we
+ *    set up the timer. When the request completes, we cancel the timer.
+ */
+void blk_add_timer(struct request *req)
+{
+       __blk_add_timer(req, &req->q->timeout_list);
 }