diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-02-10 17:29:00 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-02-10 17:29:00 +0100 |
| commit | 18741986a4b1dc4b1f171634c4191abc3b0fa023 (patch) | |
| tree | d0f632fa9b205d5fbcc76ff1cf8cba63112c7da8 /block/blk-sysfs.c | |
| parent | null_blk: use blk_complete_request and blk_mq_complete_request (diff) | |
| download | linux-18741986a4b1dc4b1f171634c4191abc3b0fa023.tar.xz linux-18741986a4b1dc4b1f171634c4191abc3b0fa023.zip | |
blk-mq: rework flush sequencing logic
Witch to using a preallocated flush_rq for blk-mq similar to what's done
with the old request path. This allows us to set up the request properly
with a tag from the actually allowed range and ->rq_disk as needed by
some drivers. To make life easier we also switch to dynamic allocation
of ->flush_rq for the old path.
This effectively reverts most of
"blk-mq: fix for flush deadlock"
and
"blk-mq: Don't reserve a tag for flush request"
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-sysfs.c')
| -rw-r--r-- | block/blk-sysfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 8095c4a21fc0..7500f876dae4 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -549,6 +549,8 @@ static void blk_release_queue(struct kobject *kobj) if (q->mq_ops) blk_mq_free_queue(q); + kfree(q->flush_rq); + blk_trace_shutdown(q); bdi_destroy(&q->backing_dev_info); |