summaryrefslogtreecommitdiffstats
path: root/block/blk-flush.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-04-14 10:30:07 +0200
committerJens Axboe <axboe@fb.com>2014-04-15 14:03:02 -0600
commit9d74e25737d73e93ccddeb5a61bcd56b7b8eb57b (patch)
treec36c53290f8b5ed7f1ae9a89b534a9c3155c0491 /block/blk-flush.c
parent742ee69b92d9559e968f70cf0a49157866f8fbef (diff)
downloadlinux-stable-9d74e25737d73e93ccddeb5a61bcd56b7b8eb57b.tar.gz
linux-stable-9d74e25737d73e93ccddeb5a61bcd56b7b8eb57b.tar.bz2
linux-stable-9d74e25737d73e93ccddeb5a61bcd56b7b8eb57b.zip
blk-mq: do not initialize req->special
Drivers can reach their private data easily using the blk_mq_rq_to_pdu helper and don't need req->special. By not initializing it code can be simplified nicely, and we also shave off a few more instructions from the I/O path. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-flush.c')
-rw-r--r--block/blk-flush.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/block/blk-flush.c b/block/blk-flush.c
index 77f20458910c..0e42adcfb55e 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -306,22 +306,16 @@ static bool blk_kick_flush(struct request_queue *q)
*/
q->flush_pending_idx ^= 1;
+ blk_rq_init(q, q->flush_rq);
if (q->mq_ops) {
- struct blk_mq_ctx *ctx = first_rq->mq_ctx;
- struct blk_mq_hw_ctx *hctx = q->mq_ops->map_queue(q, ctx->cpu);
-
- blk_mq_rq_init(hctx, q->flush_rq);
- q->flush_rq->mq_ctx = ctx;
-
/*
* Reuse the tag value from the fist waiting request,
* with blk-mq the tag is generated during request
* allocation and drivers can rely on it being inside
* the range they asked for.
*/
+ q->flush_rq->mq_ctx = first_rq->mq_ctx;
q->flush_rq->tag = first_rq->tag;
- } else {
- blk_rq_init(q, q->flush_rq);
}
q->flush_rq->cmd_type = REQ_TYPE_FS;