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);

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)
136	blk_rq_init(q, rq);	136	blk_rq_init(q, rq);
137	rq->cmd_type = REQ_TYPE_FS;	137	rq->cmd_type = REQ_TYPE_FS;
138	rq->cmd_flags = REQ_HARDBARRIER \| REQ_FLUSH;	138	rq->cmd_flags = REQ_HARDBARRIER \| REQ_FLUSH;
139	rq->rq_disk = q->bar_rq.rq_disk;	139	rq->rq_disk = q->orig_bar_rq->rq_disk;
140	rq->end_io = end_io;	140	rq->end_io = end_io;
141		141
142	elv_insert(q, rq, ELEVATOR_INSERT_FRONT);	142	elv_insert(q, rq, ELEVATOR_INSERT_FRONT);