aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-barrier.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2008-04-25 06:26:28 -0400
committerJens Axboe <jens.axboe@oracle.com>2008-04-29 03:50:34 -0400
commit1afb20f30151dd4160877c827f5b7203f98627fb (patch)
tree066e99694fbf0396ccd6b2a15e59747a81869f04 /block/blk-barrier.c
parentc3270e577c18b3d0e984c3371493205a4807db9d (diff)
block: make rq_init() do a full memset()
This requires moving rq_init() from get_request() to blk_alloc_request(). The upside is that we can now require an rq_init() from any path that wishes to hand the request to the block layer. rq_init() will be exported for the code that uses struct request without blk_get_request. This is a preparation for large command support, which needs to initialize struct request in a proper way (that is, just doing a memset() will not work). Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/blk-barrier.c')
-rw-r--r--block/blk-barrier.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/block/blk-barrier.c b/block/blk-barrier.c
index 55c5f1fc4f1f..722140ac175a 100644
--- a/block/blk-barrier.c
+++ b/block/blk-barrier.c
@@ -143,10 +143,8 @@ 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->cmd_flags = REQ_HARDBARRIER;
147 rq_init(q, rq); 146 rq_init(q, rq);
148 rq->elevator_private = NULL; 147 rq->cmd_flags = REQ_HARDBARRIER;
149 rq->elevator_private2 = NULL;
150 rq->rq_disk = q->bar_rq.rq_disk; 148 rq->rq_disk = q->bar_rq.rq_disk;
151 rq->end_io = end_io; 149 rq->end_io = end_io;
152 q->prepare_flush_fn(q, rq); 150 q->prepare_flush_fn(q, rq);
@@ -167,14 +165,11 @@ static inline struct request *start_ordered(struct request_queue *q,
167 blkdev_dequeue_request(rq); 165 blkdev_dequeue_request(rq);
168 q->orig_bar_rq = rq; 166 q->orig_bar_rq = rq;
169 rq = &q->bar_rq; 167 rq = &q->bar_rq;
170 rq->cmd_flags = 0;
171 rq_init(q, rq); 168 rq_init(q, rq);
172 if (bio_data_dir(q->orig_bar_rq->bio) == WRITE) 169 if (bio_data_dir(q->orig_bar_rq->bio) == WRITE)
173 rq->cmd_flags |= REQ_RW; 170 rq->cmd_flags |= REQ_RW;
174 if (q->ordered & QUEUE_ORDERED_FUA) 171 if (q->ordered & QUEUE_ORDERED_FUA)
175 rq->cmd_flags |= REQ_FUA; 172 rq->cmd_flags |= REQ_FUA;
176 rq->elevator_private = NULL;
177 rq->elevator_private2 = NULL;
178 init_request_from_bio(rq, q->orig_bar_rq->bio); 173 init_request_from_bio(rq, q->orig_bar_rq->bio);
179 rq->end_io = bar_end_io; 174 rq->end_io = bar_end_io;
180 175