1 files changed, 8 insertions, 0 deletions

diff --git a/block/elevator.c b/block/elevator.c
index 8e3fc3afc77..a91fc59edd0 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -36,6 +36,8 @@
 #include <linux/hash.h>
 #include <linux/uaccess.h>
 
+#include "blk.h"
+
 static DEFINE_SPINLOCK(elv_list_lock);
 static LIST_HEAD(elv_list);
 
@@ -771,6 +773,12 @@ struct request *elv_next_request(struct request_queue *q)
                          */
                         rq->cmd_flags |= REQ_STARTED;
                         blk_add_trace_rq(q, rq, BLK_TA_ISSUE);
+
+                        /*
+                         * We are now handing the request to the hardware,
+                         * add the timeout handler
+                         */
+                        blk_add_timer(rq);
                 }
 
                 if (!q->boundary_rq || q->boundary_rq == rq) {