Commit 62ebce16 authored by Omar Sandoval's avatar Omar Sandoval Committed by Jens Axboe
Browse files

blk-mq: move debugfs_remove() of disk dir to blk_release_queue() 



This needs to happen after we tear down blktrace.

Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 18fbda91

block/blk-mq-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

block/blk-sysfs.c

+3 −0
Original line number Diff line number Diff line
@@ -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);