[PATCH 5/6] blk-mq: move debugfs_remove() of disk dir to blk_release_queue()

[Omar Sandoval]

From: Omar Sandoval <osan...@fb.com>

This needs to happen after we tear down blktrace.

Signed-off-by: Omar Sandoval <osan...@fb.com>
---
 block/blk-mq-sysfs.c | 2 +-
 block/blk-sysfs.c    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 308b3f4fc310..295e69670c39 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 1dbce057592d..6cb637648936 100644
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -821,6 +821,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);
 
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe linux-block" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html