diff options
| author | Ming Lei <ming.lei@canonical.com> | 2014-09-25 23:23:44 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-09-25 15:22:41 -0600 |
| commit | ba483388e3058b3e412632a84e6bf1f134beaf3d (patch) | |
| tree | fc54df315e58958208359bd995fdb6df5115dcb2 /block/blk-core.c | |
| parent | 7c94e1c157a227837b04f02f5edeff8301410ba2 (diff) | |
| download | linux-ba483388e3058b3e412632a84e6bf1f134beaf3d.tar.bz2 | |
block: remove blk_init_flush() and its pair
Now mission of the two helpers is over, and just call
blk_alloc_flush_queue() and blk_free_flush_queue() directly.
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index cfaca8ca6cc4..dba0a8350807 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -704,7 +704,8 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn, if (!q) return NULL; - if (blk_init_flush(q)) + q->fq = blk_alloc_flush_queue(q); + if (!q->fq) return NULL; if (blk_init_rl(&q->root_rl, q, GFP_KERNEL)) @@ -740,7 +741,7 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn, return q; fail: - blk_exit_flush(q); + blk_free_flush_queue(q->fq); return NULL; } EXPORT_SYMBOL(blk_init_allocated_queue); |