From: Omar Sandoval Date: Tue, 31 Jan 2017 22:53:21 +0000 (-0800) Subject: blk-mq: move debugfs_remove() of disk dir to blk_release_queue() X-Git-Tag: v4.11-rc1~142^2^2~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62ebce16c0ac2ffac44e32f931a2d8f6e749be4c;p=thirdparty%2Fkernel%2Fstable.git blk-mq: move debugfs_remove() of disk dir to blk_release_queue() This needs to happen after we tear down blktrace. Signed-off-by: Omar Sandoval Signed-off-by: Jens Axboe --- diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c index 308b3f4fc3104..295e69670c393 100644 --- a/block/blk-mq-sysfs.c +++ b/block/blk-mq-sysfs.c @@ -254,7 +254,7 @@ static void __blk_mq_unregister_dev(struct device *dev, struct request_queue *q) kobject_put(&hctx->kobj); } - blk_mq_debugfs_unregister(q); + blk_mq_debugfs_unregister_hctxs(q); kobject_uevent(&q->mq_kobj, KOBJ_REMOVE); kobject_del(&q->mq_kobj); diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 3e204789b8d3e..3ce1217778f44 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -824,6 +824,9 @@ static void blk_release_queue(struct kobject *kobj) blk_trace_shutdown(q); + if (q->mq_ops) + blk_mq_debugfs_unregister(q); + if (q->bio_split) bioset_free(q->bio_split);