---

yaml --- r: 208321 b: refs/heads/master c: 16f2319 h: refs/heads/master i: 208319: ed6f948 v: v3
git-mirror · Aug 7, 2010 · fc08775 · fc08775
1 parent 99b5546
commit fc08775
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);