From 3d3d0c2d21309b8ce0c0a15a25abefc0bd16ac35 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Thu, 30 Oct 2008 08:32:29 +0100
Subject: [PATCH] --- yaml --- r: 118504 b: refs/heads/master c:
 2920ebbd65f3e80c318adf5191ac0987142bda80 h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/block/elevator.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 637e72fd962c..08a6d0eda28c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f92131c3dd567fc6df18ce3f46fcf57ecbdefbe0
+refs/heads/master: 2920ebbd65f3e80c318adf5191ac0987142bda80
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 59173a69ebdf..9ac82dde99dd 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -773,12 +773,6 @@ 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) {
@@ -850,6 +844,12 @@ void elv_dequeue_request(struct request_queue *q, struct request *rq)
 	 */
 	if (blk_account_rq(rq))
 		q->in_flight++;
+
+	/*
+	 * We are now handing the request to the hardware, add the
+	 * timeout handler.
+	 */
+	blk_add_timer(rq);
 }
 EXPORT_SYMBOL(elv_dequeue_request);