summaryrefslogtreecommitdiffstats
path: root/block/blk-sysfs.c
diff options
context:
space:
mode:
authorMing Lei <ming.lei@canonical.com>2014-09-25 23:23:40 +0800
committerJens Axboe <axboe@fb.com>2014-09-25 15:22:35 -0600
commitf355265571440a7db16e784b6edf4e7d26971a03 (patch)
tree79b20c37c734b5932dcecc9e85850847b0a69855 /block/blk-sysfs.c
parent1bcb1eada4f11a713cbe586d1b5a5d93a48277cb (diff)
downloadlinux-stable-f355265571440a7db16e784b6edf4e7d26971a03.tar.gz
linux-stable-f355265571440a7db16e784b6edf4e7d26971a03.tar.bz2
linux-stable-f355265571440a7db16e784b6edf4e7d26971a03.zip
block: introduce blk_init_flush and its pair
These two temporary functions are introduced for holding flush initialization and de-initialization, so that we can introduce 'flush queue' easier in the following patch. And once 'flush queue' and its allocation/free functions are ready, they will be removed for sake of code readability. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ming Lei <ming.lei@canonical.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-sysfs.c')
-rw-r--r--block/blk-sysfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 17f5c84ce7bf..949075952119 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -517,11 +517,11 @@ static void blk_release_queue(struct kobject *kobj)
if (q->queue_tags)
__blk_queue_free_tags(q);
+ blk_exit_flush(q);
+
if (q->mq_ops)
blk_mq_free_queue(q);
- kfree(q->flush_rq);
-
blk_trace_shutdown(q);
bdi_destroy(&q->backing_dev_info);