From 560ff2ed8ae4e304f6fa325b9bc61d79acfb135a Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Sat, 4 Feb 2006 23:27:38 -0800
Subject: [PATCH] --- yaml --- r: 19791 b: refs/heads/master c:
 238e7db9357bfe1ce3d6f7ac1e60e595e9d46b7b h: refs/heads/master i:   19789:
 3067511d81425c4a715bd1a05b48824b35d06388   19787:
 288f858552797af559bedef8a89dafdfac510bf9   19783:
 9d47ac5d61543c6d35740fcce90cbab734bbc801   19775:
 447814d5a30bac67358436eda0f30a1121b6c2ee v: v3

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

diff --git a/[refs] b/[refs]
index e510ad876993..92e8090f7c60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a7a67af8bb02106f0fb01dd9d237332f874be9a
+refs/heads/master: 238e7db9357bfe1ce3d6f7ac1e60e595e9d46b7b
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 96a61e029ce5..2fc269f69726 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -323,7 +323,8 @@ void __elv_add_request(request_queue_t *q, struct request *rq, int where,
 		/*
 		 * toggle ordered color
 		 */
-		q->ordcolor ^= 1;
+		if (blk_barrier_rq(rq))
+			q->ordcolor ^= 1;
 
 		/*
 		 * barriers implicitly indicate back insertion