block: set up rq->rq_disk properly for flush requests

q->bar_rq.rq_disk is NULL. Use the rq_disk of the original request
instead.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/block/blk-barrier.c b/block/blk-barrier.c
index d95a1440e29d..f0faefca032f 100644
--- a/block/blk-barrier.c
+++ b/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);