dlm: Replace default_attrs in dlm_ktype with default_groups
authorKimberly Brown <kimbrownkd@gmail.com>
Wed, 8 May 2019 01:48:05 +0000 (21:48 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Jun 2019 11:50:22 +0000 (13:50 +0200)
The kobj_type default_attrs field is being replaced by the
default_groups field, so replace the default_attrs field in dlm_ktype
with default_groups. Use the ATTRIBUTE_GROUPS macro to create
dlm_groups.

Signed-off-by: Kimberly Brown <kimbrownkd@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/dlm/lockspace.c

index 4c2c85a223acd5a12b34839b5489c6e3f73995f1..afb8340918b868438e188de7b3b5052845d4ab71 100644 (file)
@@ -158,6 +158,7 @@ static struct attribute *dlm_attrs[] = {
        &dlm_attr_recover_nodeid.attr,
        NULL,
 };
+ATTRIBUTE_GROUPS(dlm);
 
 static ssize_t dlm_attr_show(struct kobject *kobj, struct attribute *attr,
                             char *buf)
@@ -187,7 +188,7 @@ static const struct sysfs_ops dlm_attr_ops = {
 };
 
 static struct kobj_type dlm_ktype = {
-       .default_attrs = dlm_attrs,
+       .default_groups = dlm_groups,
        .sysfs_ops     = &dlm_attr_ops,
        .release       = lockspace_kobj_release,
 };