diff options
Diffstat (limited to 'block/blk-barrier.c')
-rw-r--r-- | block/blk-barrier.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-barrier.c b/block/blk-barrier.c index 47127ba09e45..66e55288178c 100644 --- a/block/blk-barrier.c +++ b/block/blk-barrier.c | |||
@@ -143,7 +143,7 @@ static void queue_flush(struct request_queue *q, unsigned which) | |||
143 | end_io = post_flush_end_io; | 143 | end_io = post_flush_end_io; |
144 | } | 144 | } |
145 | 145 | ||
146 | rq_init(q, rq); | 146 | blk_rq_init(q, rq); |
147 | rq->cmd_flags = REQ_HARDBARRIER; | 147 | rq->cmd_flags = REQ_HARDBARRIER; |
148 | rq->rq_disk = q->bar_rq.rq_disk; | 148 | rq->rq_disk = q->bar_rq.rq_disk; |
149 | rq->end_io = end_io; | 149 | rq->end_io = end_io; |
@@ -165,7 +165,7 @@ static inline struct request *start_ordered(struct request_queue *q, | |||
165 | blkdev_dequeue_request(rq); | 165 | blkdev_dequeue_request(rq); |
166 | q->orig_bar_rq = rq; | 166 | q->orig_bar_rq = rq; |
167 | rq = &q->bar_rq; | 167 | rq = &q->bar_rq; |
168 | rq_init(q, rq); | 168 | blk_rq_init(q, rq); |
169 | if (bio_data_dir(q->orig_bar_rq->bio) == WRITE) | 169 | if (bio_data_dir(q->orig_bar_rq->bio) == WRITE) |
170 | rq->cmd_flags |= REQ_RW; | 170 | rq->cmd_flags |= REQ_RW; |
171 | if (q->ordered & QUEUE_ORDERED_FUA) | 171 | if (q->ordered & QUEUE_ORDERED_FUA) |