tg3: Update version to 3.115

[net-next-2.6.git] / block / blk-barrier.c

diff --git a/block/blk-barrier.c b/block/blk-barrier.c
index 557f69360b6a027285b2507c8ad139c8ecea31c2..f0faefca032ff59d739460be5e7898a61d33cc48 100644 (file)
--- a/block/blk-barrier.c
+++ b/block/blk-barrier.c
@@ -134,8 +134,9 @@ 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);