diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2017-05-25 16:38:06 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-05-26 07:25:13 -0600 |
| commit | a8ecdd7117ee68fe27009acc8021423870c1dcd7 (patch) | |
| tree | c94396011318e42c77a75d92e93a191deb81e262 | |
| parent | 223220356d5ebc05ead9a8d697abb0c0a906fc81 (diff) | |
| download | op-kernel-dev-a8ecdd7117ee68fe27009acc8021423870c1dcd7.zip op-kernel-dev-a8ecdd7117ee68fe27009acc8021423870c1dcd7.tar.gz | |
blk-mq: Only register debugfs attributes for blk-mq queues
The code in blk-mq-debugfs.c assumes that it is working on a blk-mq
queue and is not intended to work on a blk-sq queue. Hence only
register blk-mq debugfs attributes for blk-mq queues.
Fixes: commit 9c1051aacde8 ("blk-mq: untangle debugfs and sysfs")
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -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 504fee9..712b018 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -887,10 +887,10 @@ int blk_register_queue(struct gendisk *disk) goto unlock; } - if (q->mq_ops) + if (q->mq_ops) { __blk_mq_register_dev(dev, q); - - blk_mq_debugfs_register(q); + blk_mq_debugfs_register(q); + } kobject_uevent(&q->kobj, KOBJ_ADD); |
