From fc08775f96c0acff6f9716cc4f894967f42142c8 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Fri, 9 Jul 2010 09:38:25 +0900
Subject: [PATCH] --- yaml --- r: 208321 b: refs/heads/master c:
 16f2319fd67b169c0b34391d3fa0870fff129891 h: refs/heads/master i:   208319:
 ed6f948190fd0625473fea9012b92792063c1b7b v: v3

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

diff --git a/[refs] b/[refs]
index e24513636b46..49774ea88820 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28e18d0188b9e3ab82ebd09d9b1d1c7f8d1822aa
+refs/heads/master: 16f2319fd67b169c0b34391d3fa0870fff129891
diff --git a/trunk/block/blk-barrier.c b/trunk/block/blk-barrier.c
index d95a1440e29d..f0faefca032f 100644
--- a/trunk/block/blk-barrier.c
+++ b/trunk/block/blk-barrier.c
@@ -136,7 +136,7 @@ static void queue_flush(struct request_queue *q, unsigned which)
 	blk_rq_init(q, rq);
 	rq->cmd_type = REQ_TYPE_FS;
 	rq->cmd_flags = REQ_HARDBARRIER | REQ_FLUSH;
-	rq->rq_disk = q->bar_rq.rq_disk;
+	rq->rq_disk = q->orig_bar_rq->rq_disk;
 	rq->end_io = end_io;
 
 	elv_insert(q, rq, ELEVATOR_INSERT_FRONT);