mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 20:51:03 +02:00
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>
This commit is contained in:
committed by
Jens Axboe
parent
18fbda91c6
commit
62ebce16c0
@@ -254,7 +254,7 @@ static void __blk_mq_unregister_dev(struct device *dev, struct request_queue *q)
|
|||||||
kobject_put(&hctx->kobj);
|
kobject_put(&hctx->kobj);
|
||||||
}
|
}
|
||||||
|
|
||||||
blk_mq_debugfs_unregister(q);
|
blk_mq_debugfs_unregister_hctxs(q);
|
||||||
|
|
||||||
kobject_uevent(&q->mq_kobj, KOBJ_REMOVE);
|
kobject_uevent(&q->mq_kobj, KOBJ_REMOVE);
|
||||||
kobject_del(&q->mq_kobj);
|
kobject_del(&q->mq_kobj);
|
||||||
|
@@ -824,6 +824,9 @@ static void blk_release_queue(struct kobject *kobj)
|
|||||||
|
|
||||||
blk_trace_shutdown(q);
|
blk_trace_shutdown(q);
|
||||||
|
|
||||||
|
if (q->mq_ops)
|
||||||
|
blk_mq_debugfs_unregister(q);
|
||||||
|
|
||||||
if (q->bio_split)
|
if (q->bio_split)
|
||||||
bioset_free(q->bio_split);
|
bioset_free(q->bio_split);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user