[PATCH 1/2] block: request_queue->ordcolor must not be flipped on SOFTBARRIER

[Tejun Heo <htejun@gmail.com>]

q->ordcolor must not be flipped on SOFTBARRIER.

Signed-off-by: Tejun Heo <htejun@gmail.com>

---

 block/elevator.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

56261a6b475696b0ff97a3df6c8fbcec9760b514
diff --git a/block/elevator.c b/block/elevator.c
index f905e47..4c0fe1c 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -336,7 +336,8 @@ void __elv_add_request(request_queue_t *
 		/*
 		 * toggle ordered color
 		 */
-		q->ordcolor ^= 1;
+		if (blk_barrier_rq(rq))
+			q->ordcolor ^= 1;
 
 		/*
 		 * barriers implicitly indicate back insertion
-- 
1.0.6


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/