blk-mq: cleanup disk sysfs registration

Pass a gendisk to the sysfs register/unregister functions and give
them descriptive names.  Also move the unregistration helper next
to the one doing the registration.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220628171850.1313069-7-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index ee6efe2b250d2e2e814cb025e1126f4979ba77f9..93997d297d4274fafd0b35944f30a9604127cb62 100644 (file)
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -203,22 +203,6 @@ static int blk_mq_register_hctx(struct blk_mq_hw_ctx *hctx)
        return ret;
 }
 
-void blk_mq_unregister_dev(struct device *dev, struct request_queue *q)
-{
-       struct blk_mq_hw_ctx *hctx;
-       unsigned long i;
-
-       lockdep_assert_held(&q->sysfs_dir_lock);
-
-       queue_for_each_hw_ctx(q, hctx, i)
-               blk_mq_unregister_hctx(hctx);
-
-       kobject_uevent(q->mq_kobj, KOBJ_REMOVE);
-       kobject_del(q->mq_kobj);
-
-       q->mq_sysfs_init_done = false;
-}
-
 void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx)
 {
        kobject_init(&hctx->kobj, &blk_mq_hw_ktype);
@@ -251,16 +235,16 @@ void blk_mq_sysfs_init(struct request_queue *q)
        }
 }
 
-int __blk_mq_register_dev(struct device *dev, struct request_queue *q)
+int blk_mq_sysfs_register(struct gendisk *disk)
 {
+       struct request_queue *q = disk->queue;
        struct blk_mq_hw_ctx *hctx;
        unsigned long i, j;
        int ret;
 
-       WARN_ON_ONCE(!q->kobj.parent);
        lockdep_assert_held(&q->sysfs_dir_lock);
 
-       ret = kobject_add(q->mq_kobj, &dev->kobj, "%s", "mq");
+       ret = kobject_add(q->mq_kobj, &disk_to_dev(disk)->kobj, "mq");
        if (ret < 0)
                goto out;
 
@@ -288,6 +272,23 @@ unreg:
        return ret;
 }
 
+void blk_mq_sysfs_unregister(struct gendisk *disk)
+{
+       struct request_queue *q = disk->queue;
+       struct blk_mq_hw_ctx *hctx;
+       unsigned long i;
+
+       lockdep_assert_held(&q->sysfs_dir_lock);
+
+       queue_for_each_hw_ctx(q, hctx, i)
+               blk_mq_unregister_hctx(hctx);
+
+       kobject_uevent(q->mq_kobj, KOBJ_REMOVE);
+       kobject_del(q->mq_kobj);
+
+       q->mq_sysfs_init_done = false;
+}
+
 void blk_mq_sysfs_unregister_hctxs(struct request_queue *q)
 {
        struct blk_mq_hw_ctx *hctx;

diff --git a/block/blk-mq.h b/block/blk-mq.h
index a92639f2bfd21bac695f58a73e2c166ee5b8a903..54e20edf0da30d4854b4764ce85a69499270bfdf 100644 (file)
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -118,7 +118,8 @@ static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q,
  */
 extern void blk_mq_sysfs_init(struct request_queue *q);
 extern void blk_mq_sysfs_deinit(struct request_queue *q);
-extern int __blk_mq_register_dev(struct device *dev, struct request_queue *q);
+int blk_mq_sysfs_register(struct gendisk *disk);
+void blk_mq_sysfs_unregister(struct gendisk *disk);
 int blk_mq_sysfs_register_hctxs(struct request_queue *q);
 void blk_mq_sysfs_unregister_hctxs(struct request_queue *q);
 extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx);

diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
index b72506770b97e26e144532d4a21ad6bcf3aed990..85ea43eff094ca765a536bc7ab2fbb2cf5677b71 100644 (file)
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
@@ -812,18 +812,17 @@ struct kobj_type blk_queue_ktype = {
  */
 int blk_register_queue(struct gendisk *disk)
 {
-       int ret;
-       struct device *dev = disk_to_dev(disk);
        struct request_queue *q = disk->queue;
+       int ret;
 
        mutex_lock(&q->sysfs_dir_lock);
 
-       ret = kobject_add(&q->kobj, &dev->kobj, "%s", "queue");
+       ret = kobject_add(&q->kobj, &disk_to_dev(disk)->kobj, "queue");
        if (ret < 0)
                goto unlock;
 
        if (queue_is_mq(q))
-               __blk_mq_register_dev(dev, q);
+               blk_mq_sysfs_register(disk);
        mutex_lock(&q->sysfs_lock);
 
        mutex_lock(&q->debugfs_mutex);
@@ -919,7 +918,7 @@ void blk_unregister_queue(struct gendisk *disk)
         * structures that can be modified through sysfs.
         */
        if (queue_is_mq(q))
-               blk_mq_unregister_dev(disk_to_dev(disk), q);
+               blk_mq_sysfs_unregister(disk);
        blk_crypto_sysfs_unregister(q);
 
        mutex_lock(&q->sysfs_lock);

diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 0fd96e92c6c650cfcddabf6fbb2cd869d504cacb..43aad0da3305df7e3bc93041e7e8d9c35201bc32 100644 (file)
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -691,7 +691,6 @@ struct gendisk *blk_mq_alloc_disk_for_queue(struct request_queue *q,
 struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *);
 int blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
                struct request_queue *q);
-void blk_mq_unregister_dev(struct device *, struct request_queue *);
 void blk_mq_destroy_queue(struct request_queue *);
 
 int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set);