diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-04-26 13:47:48 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-26 15:09:04 -0600 |
| commit | 2d0364c8c1a97a1d44760895a982221c06af0f35 (patch) | |
| tree | 815eee282e7f3204d4c723e5b190ffc026f0fb02 /block/blk-sysfs.c | |
| parent | 1608fd1ca3b9357ea20ffc3a8ad2d1e4b78301a6 (diff) | |
| download | linux-2d0364c8c1a97a1d44760895a982221c06af0f35.tar.bz2 | |
blk-mq: Register <dev>/queue/mq after having registered <dev>/queue
A later patch in this series will modify blk_mq_debugfs_register()
such that it uses q->kobj.parent to determine the name of a
request queue. Hence make sure that that pointer is initialized
before blk_mq_debugfs_register() is called. To avoid lock inversion,
protect sysfs / debugfs registration with the queue sysfs_lock
instead of the global mutex all_q_mutex.
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-sysfs.c')
| -rw-r--r-- | block/blk-sysfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index f85723332288..3f37813ccbaf 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -877,9 +877,6 @@ int blk_register_queue(struct gendisk *disk) if (ret) return ret; - if (q->mq_ops) - blk_mq_register_dev(dev, q); - /* Prevent changes through sysfs until registration is completed. */ mutex_lock(&q->sysfs_lock); @@ -889,6 +886,9 @@ int blk_register_queue(struct gendisk *disk) goto unlock; } + if (q->mq_ops) + __blk_mq_register_dev(dev, q); + kobject_uevent(&q->kobj, KOBJ_ADD); wbt_enable_default(q); |