aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2010-07-09 09:38:25 +0900
committerJens Axboe <jaxboe@fusionio.com>2010-08-07 18:52:41 +0200
commit16f2319fd67b169c0b34391d3fa0870fff129891 (patch)
tree986105ef1ea459ad54a28cd19a1585a7e23e850f /block
parent28e18d0188b9e3ab82ebd09d9b1d1c7f8d1822aa (diff)
downloadmrst-s0i3-test-16f2319fd67b169c0b34391d3fa0870fff129891.tar.gz
mrst-s0i3-test-16f2319fd67b169c0b34391d3fa0870fff129891.tar.xz
mrst-s0i3-test-16f2319fd67b169c0b34391d3fa0870fff129891.zip
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>
Diffstat (limited to 'block')
-rw-r--r--block/blk-barrier.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-barrier.c b/block/blk-barrier.c
index d95a1440e29..f0faefca032 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);