From ef254d13f1783793747c639d8e79843d5caf995a Mon Sep 17 00:00:00 2001 From: Kimberly Brown Date: Fri, 7 Jun 2019 14:23:00 -0400 Subject: [PATCH] gfs2: replace ktype default_attrs with default_groups The kobj_type default_attrs field is being replaced by the default_groups field. Replace the default_attrs field in gfs2_ktype with default_groups. Use the ATTRIBUTE_GROUPS macro to create gfs2_groups. Signed-off-by: Kimberly Brown Signed-off-by: Greg Kroah-Hartman --- fs/gfs2/sys.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c index 08e4996adc23..fddfb87abd38 100644 --- a/fs/gfs2/sys.c +++ b/fs/gfs2/sys.c @@ -299,6 +299,7 @@ static struct attribute *gfs2_attrs[] = { &gfs2_attr_demote_rq.attr, NULL, }; +ATTRIBUTE_GROUPS(gfs2); static void gfs2_sbd_release(struct kobject *kobj) { @@ -309,7 +310,7 @@ static void gfs2_sbd_release(struct kobject *kobj) static struct kobj_type gfs2_ktype = { .release = gfs2_sbd_release, - .default_attrs = gfs2_attrs, + .default_groups = gfs2_groups, .sysfs_ops = &gfs2_attr_ops, }; -- 2.39.5