From 92a8d51bc26eddfb4fe76ef3ce4530f9990e9b5a Mon Sep 17 00:00:00 2001
From: Linas Vepstas <linas@austin.ibm.com>
Date: Tue, 23 Jan 2007 19:40:54 +0100
Subject: [PATCH] --- yaml --- r: 45726 b: refs/heads/master c:
 95543179f158b4891c5dc49004853ce081e8d794 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index db4c2329eaf3..7ae73d426ea4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a7122923e87fc5cdf8affa1845924a0def4657d
+refs/heads/master: 95543179f158b4891c5dc49004853ce081e8d794
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 536be740ba4e..f6dafa8c7c4d 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -590,6 +590,12 @@ void elv_insert(request_queue_t *q, struct request *rq, int where)
 		 */
 		rq->cmd_flags |= REQ_SOFTBARRIER;
 
+		/*
+		 * Most requeues happen because of a busy condition,
+		 * don't force unplug of the queue for that case.
+		 */
+		unplug_it = 0;
+
 		if (q->ordseq == 0) {
 			list_add(&rq->queuelist, &q->queue_head);
 			break;
@@ -604,11 +610,6 @@ void elv_insert(request_queue_t *q, struct request *rq, int where)
 		}
 
 		list_add_tail(&rq->queuelist, pos);
-		/*
-		 * most requeues happen because of a busy condition, don't
-		 * force unplug of the queue for that case.
-		 */
-		unplug_it = 0;
 		break;
 
 	default: