ocfs2: cluster: use default_groups in kobj_type
PATCH 1/1 ocfs2: cluster: use default_groups in kobj_type
There are currently 2 ways to create a set of sysfs files for a kobj_type, through the default_attrs field, and the default_groups field. Move the ocfs2 cluster sysfs code to use default_groups field which has been the preferred way since aa30f47cf666 ("kobject: Add support for default attribute groups to kobj_type") so that we can soon get rid of the obsolete default_attrs field.
--- fs/ocfs2/cluster/masklog.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
fs/ocfs2/cluster/masklog.c +6 -5
@@ -120,7 +120,8 @@ static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = { define_mask(KTHREAD), }; -static struct attribute *mlog_attr_ptrs[MLOG_MAX_BITS ] = {NULL , }; +static struct attribute *mlog_default_attrs[MLOG_MAX_BITS ] = {NULL , }; +ATTRIBUTE_GROUPS (mlog_default);static ssize_t mlog_show (struct kobject *obj,struct attribute *attr,char *buf)
@@ -144,8 +145,8 @@ static const struct sysfs_ops mlog_attr_ops = { };static struct kobj_type mlog_ktype = { - .default_attrs = mlog_attr_ptrs, - .sysfs_ops = &mlog_attr_ops, + .default_groups = mlog_default_groups, + .sysfs_ops = &mlog_attr_ops, };static struct kset mlog_kset = {
@@ -157,10 +158,10 @@ int mlog_sys_init(struct kset *o2cb_kset)int i =0 ;while (mlog_attrs[i].attr.mode) { - mlog_attr_ptrs[i] = &mlog_attrs[i].attr; + mlog_default_attrs[i] = &mlog_attrs[i].attr; i++; } - mlog_attr_ptrs[i] =NULL ; + mlog_default_attrs[i] =NULL ;kobject_set_name (&mlog_kset.kobj,"logmask" ); mlog_kset.kobj.kset = o2cb_kset;
Signature · 1 line
2.34.1
Joseph Qi
maintainerQuoted 59 lines · Greg Kroah-Hartman
There are currently 2 ways to create a set of sysfs files for a
kobj_type, through thedefault_attrsfield, and thedefault_groupsfield. Move the ocfs2 cluster sysfs code to usedefault_groupsfield which has been the preferred way sinceaa30f47cf666("kobject: Add support for default attribute groups tokobj_type") so that we can soon get rid of the obsoletedefault_attrsfield.Cc Mark Fasheh <[email protected]>Cc Joel Becker <[email protected]>Cc Joseph Qi <[email protected]>Cc Masahiro Yamada <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Andrew Morton <[email protected]>Cc Miguel Ojeda <[email protected]>Cc Geert Uytterhoeven <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- fs/ocfs2/cluster/masklog.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)fs/ocfs2/cluster/masklog.c +6
-5@@ -120,7 +120,8 @@ static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = { define_mask(KTHREAD), }; -static struct attribute *mlog_attr_ptrs[MLOG_MAX_BITS ] = {NULL , }; +static struct attribute *mlog_default_attrs[MLOG_MAX_BITS ] = {NULL , }; +ATTRIBUTE_GROUPS (mlog_default);static ssize_t mlog_show (struct kobject *obj,struct attribute *attr,char *buf)@@ -144,8 +145,8 @@ static const struct sysfs_ops mlog_attr_ops = { };static struct kobj_type mlog_ktype = { - .default_attrs = mlog_attr_ptrs, - .sysfs_ops = &mlog_attr_ops, + .default_groups = mlog_default_groups, + .sysfs_ops = &mlog_attr_ops, };static struct kset mlog_kset = {@@ -157,10 +158,10 @@ int mlog_sys_init(struct kset *o2cb_kset)int i =0 ;while (mlog_attrs[i].attr.mode) { - mlog_attr_ptrs[i] = &mlog_attrs[i].attr; + mlog_default_attrs[i] = &mlog_attrs[i].attr; i++; } - mlog_attr_ptrs[i] =NULL ; + mlog_default_attrs[i] =NULL ;kobject_set_name (&mlog_kset.kobj,"logmask" ); mlog_kset.kobj.kset = o2cb_kset;