Merge tag 'for-5.2/block-20190507' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / block / blk-mq-sysfs.c

diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c
index 2280d3c..d6e1a9b 100644 (file)
--- a/block/blk-mq-sysfs.c
+++ b/block/blk-mq-sysfs.c
@@ -182,10 +182,6 @@ static ssize_t blk_mq_hw_sysfs_cpus_show(struct blk_mq_hw_ctx *hctx, char *page)
        return ret;
 }
 
-static struct attribute *default_ctx_attrs[] = {
-       NULL,
-};
-
 static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_nr_tags = {
        .attr = {.name = "nr_tags", .mode = 0444 },
        .show = blk_mq_hw_sysfs_nr_tags_show,
@@ -205,6 +201,7 @@ static struct attribute *default_hw_ctx_attrs[] = {
        &blk_mq_hw_sysfs_cpus.attr,
        NULL,
 };
+ATTRIBUTE_GROUPS(default_hw_ctx);
 
 static const struct sysfs_ops blk_mq_sysfs_ops = {
        .show   = blk_mq_sysfs_show,
@@ -223,13 +220,12 @@ static struct kobj_type blk_mq_ktype = {
 
 static struct kobj_type blk_mq_ctx_ktype = {
        .sysfs_ops      = &blk_mq_sysfs_ops,
-       .default_attrs  = default_ctx_attrs,
        .release        = blk_mq_ctx_sysfs_release,
 };
 
 static struct kobj_type blk_mq_hw_ktype = {
        .sysfs_ops      = &blk_mq_hw_sysfs_ops,
-       .default_attrs  = default_hw_ctx_attrs,
+       .default_groups = default_hw_ctx_groups,
        .release        = blk_mq_hw_sysfs_release,
 };