commit 62ebce16c0ac2ffac44e32f931a2d8f6e749be4c
author Omar Sandoval <osandov@fb.com> Tue Jan 31 14:53:21 2017 -0800
committer Jens Axboe <axboe@fb.com> Thu Feb 02 10:20:16 2017 -0700
tree e49141e8e4bf7da4984f911812f6a1ffefed7576
parent 18fbda91c6370d520278db9ee1e768b59ef5c4ab

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 <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

block/blk-sysfs.c

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index 3e20478..3ce12177 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);