From: "Matias Bjørling" <m@bjorling.me> To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@fb.com, keith.busch@intel.com, linux-nvme@lists.infradead.org Cc: "Matias Bjørling" <m@bjorling.me> Subject: [PATCH 3/6] blk-mq: register device instead of disk Date: Fri, 10 Jun 2016 14:20:59 +0200 [thread overview] Message-ID: <1465561262-13789-4-git-send-email-m@bjorling.me> (raw) In-Reply-To: <1465561262-13789-1-git-send-email-m@bjorling.me> Enable devices without a gendisk instance to register itself with blk-mq and expose the associated multi-queue sysfs entries. Signed-off-by: Matias Bjørling <m@bjorling.me> --- block/blk-mq-sysfs.c | 13 +++++-------- block/blk-sysfs.c | 4 ++-- drivers/md/dm.c | 2 +- include/linux/blk-mq.h | 4 ++-- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c index 4ea4dd8..f67b5c1 100644 --- a/block/blk-mq-sysfs.c +++ b/block/blk-mq-sysfs.c @@ -380,9 +380,8 @@ static int blk_mq_register_hctx(struct blk_mq_hw_ctx *hctx) return ret; } -void blk_mq_unregister_disk(struct gendisk *disk) +void blk_mq_unregister_dev(struct device *dev, struct request_queue *q) { - struct request_queue *q = disk->queue; struct blk_mq_hw_ctx *hctx; struct blk_mq_ctx *ctx; int i, j; @@ -402,7 +401,7 @@ void blk_mq_unregister_disk(struct gendisk *disk) kobject_del(&q->mq_kobj); kobject_put(&q->mq_kobj); - kobject_put(&disk_to_dev(disk)->kobj); + kobject_put(&dev->kobj); q->mq_sysfs_init_done = false; blk_mq_enable_hotplug(); @@ -426,10 +425,8 @@ static void blk_mq_sysfs_init(struct request_queue *q) } } -int blk_mq_register_disk(struct gendisk *disk) +int blk_mq_register_dev(struct device *dev, struct request_queue *q) { - struct device *dev = disk_to_dev(disk); - struct request_queue *q = disk->queue; struct blk_mq_hw_ctx *hctx; int ret, i; @@ -450,7 +447,7 @@ int blk_mq_register_disk(struct gendisk *disk) } if (ret) - blk_mq_unregister_disk(disk); + blk_mq_unregister_dev(dev, q); else q->mq_sysfs_init_done = true; out: @@ -458,7 +455,7 @@ out: return ret; } -EXPORT_SYMBOL_GPL(blk_mq_register_disk); +EXPORT_SYMBOL_GPL(blk_mq_register_dev); void blk_mq_sysfs_unregister(struct request_queue *q) { diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 9920596..5223c5f 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -693,7 +693,7 @@ int blk_register_queue(struct gendisk *disk) kobject_uevent(&q->kobj, KOBJ_ADD); if (q->mq_ops) - blk_mq_register_disk(disk); + blk_mq_register_dev(disk_to_dev(disk), q); if (!q->request_fn) return 0; @@ -718,7 +718,7 @@ void blk_unregister_queue(struct gendisk *disk) return; if (q->mq_ops) - blk_mq_unregister_disk(disk); + blk_mq_unregister_dev(disk_to_dev(disk), q); if (q->request_fn) elv_unregister_queue(q); diff --git a/drivers/md/dm.c b/drivers/md/dm.c index aba7ed9..9de3a9c 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2798,7 +2798,7 @@ static int dm_mq_init_request_queue(struct mapped_device *md, dm_init_md_queue(md); /* backfill 'mq' sysfs registration normally done in blk_register_queue */ - blk_mq_register_disk(md->disk); + blk_mq_register_dev(disk_to_dev(md->disk), q); return 0; diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 2498fdf..ab6fb32 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -176,8 +176,8 @@ enum { struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *); struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, struct request_queue *q); -int blk_mq_register_disk(struct gendisk *); -void blk_mq_unregister_disk(struct gendisk *); +int blk_mq_register_dev(struct device *, struct request_queue *); +void blk_mq_unregister_dev(struct device *, struct request_queue *); int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set); void blk_mq_free_tag_set(struct blk_mq_tag_set *set); -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: m@bjorling.me (Matias Bjørling) Subject: [PATCH 3/6] blk-mq: register device instead of disk Date: Fri, 10 Jun 2016 14:20:59 +0200 [thread overview] Message-ID: <1465561262-13789-4-git-send-email-m@bjorling.me> (raw) In-Reply-To: <1465561262-13789-1-git-send-email-m@bjorling.me> Enable devices without a gendisk instance to register itself with blk-mq and expose the associated multi-queue sysfs entries. Signed-off-by: Matias Bj?rling <m at bjorling.me> --- block/blk-mq-sysfs.c | 13 +++++-------- block/blk-sysfs.c | 4 ++-- drivers/md/dm.c | 2 +- include/linux/blk-mq.h | 4 ++-- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c index 4ea4dd8..f67b5c1 100644 --- a/block/blk-mq-sysfs.c +++ b/block/blk-mq-sysfs.c @@ -380,9 +380,8 @@ static int blk_mq_register_hctx(struct blk_mq_hw_ctx *hctx) return ret; } -void blk_mq_unregister_disk(struct gendisk *disk) +void blk_mq_unregister_dev(struct device *dev, struct request_queue *q) { - struct request_queue *q = disk->queue; struct blk_mq_hw_ctx *hctx; struct blk_mq_ctx *ctx; int i, j; @@ -402,7 +401,7 @@ void blk_mq_unregister_disk(struct gendisk *disk) kobject_del(&q->mq_kobj); kobject_put(&q->mq_kobj); - kobject_put(&disk_to_dev(disk)->kobj); + kobject_put(&dev->kobj); q->mq_sysfs_init_done = false; blk_mq_enable_hotplug(); @@ -426,10 +425,8 @@ static void blk_mq_sysfs_init(struct request_queue *q) } } -int blk_mq_register_disk(struct gendisk *disk) +int blk_mq_register_dev(struct device *dev, struct request_queue *q) { - struct device *dev = disk_to_dev(disk); - struct request_queue *q = disk->queue; struct blk_mq_hw_ctx *hctx; int ret, i; @@ -450,7 +447,7 @@ int blk_mq_register_disk(struct gendisk *disk) } if (ret) - blk_mq_unregister_disk(disk); + blk_mq_unregister_dev(dev, q); else q->mq_sysfs_init_done = true; out: @@ -458,7 +455,7 @@ out: return ret; } -EXPORT_SYMBOL_GPL(blk_mq_register_disk); +EXPORT_SYMBOL_GPL(blk_mq_register_dev); void blk_mq_sysfs_unregister(struct request_queue *q) { diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 9920596..5223c5f 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -693,7 +693,7 @@ int blk_register_queue(struct gendisk *disk) kobject_uevent(&q->kobj, KOBJ_ADD); if (q->mq_ops) - blk_mq_register_disk(disk); + blk_mq_register_dev(disk_to_dev(disk), q); if (!q->request_fn) return 0; @@ -718,7 +718,7 @@ void blk_unregister_queue(struct gendisk *disk) return; if (q->mq_ops) - blk_mq_unregister_disk(disk); + blk_mq_unregister_dev(disk_to_dev(disk), q); if (q->request_fn) elv_unregister_queue(q); diff --git a/drivers/md/dm.c b/drivers/md/dm.c index aba7ed9..9de3a9c 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -2798,7 +2798,7 @@ static int dm_mq_init_request_queue(struct mapped_device *md, dm_init_md_queue(md); /* backfill 'mq' sysfs registration normally done in blk_register_queue */ - blk_mq_register_disk(md->disk); + blk_mq_register_dev(disk_to_dev(md->disk), q); return 0; diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 2498fdf..ab6fb32 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -176,8 +176,8 @@ enum { struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *); struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, struct request_queue *q); -int blk_mq_register_disk(struct gendisk *); -void blk_mq_unregister_disk(struct gendisk *); +int blk_mq_register_dev(struct device *, struct request_queue *); +void blk_mq_unregister_dev(struct device *, struct request_queue *); int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set); void blk_mq_free_tag_set(struct blk_mq_tag_set *set); -- 2.1.4
next prev parent reply other threads:[~2016-06-10 12:21 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-10 12:20 [PATCH 0/6] sysfs support for LightNVM Matias Bjørling 2016-06-10 12:20 ` Matias Bjørling 2016-06-10 12:20 ` [PATCH 1/6] nvme: refactor namespaces to support non-gendisk devices Matias Bjørling 2016-06-10 12:20 ` Matias Bjørling 2016-06-10 12:20 ` Matias Bjørling 2016-06-10 12:20 ` [PATCH 2/6] null_blk: refactor " Matias Bjørling 2016-06-10 12:20 ` Matias Bjørling 2016-06-10 12:20 ` Matias Bjørling 2016-06-10 12:20 ` Matias Bjørling [this message] 2016-06-10 12:20 ` [PATCH 3/6] blk-mq: register device instead of disk Matias Bjørling 2016-06-10 12:21 ` [PATCH 4/6] lightnvm: let drivers control the lifetime of nvm_dev Matias Bjørling 2016-06-10 12:21 ` Matias Bjørling 2016-06-10 12:21 ` Matias Bjørling 2016-06-29 14:51 [PATCH 0/6] enable sysfs for lightnvm Matias Bjørling 2016-06-29 14:51 ` [PATCH 3/6] blk-mq: register device instead of disk Matias Bjørling 2016-06-29 14:51 ` Matias Bjørling 2016-06-29 14:51 ` Matias Bjørling 2016-06-29 14:51 ` Matias Bjørling
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1465561262-13789-4-git-send-email-m@bjorling.me \ --to=m@bjorling.me \ --cc=axboe@fb.com \ --cc=keith.busch@intel.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.