diff mbox series

ocfs2: use default_groups in kobj_type

Message ID 20211228144517.391660-1-gregkh@linuxfoundation.org (mailing list archive)
State New
Headers show
Series ocfs2: use default_groups in kobj_type | expand

Commit Message

Greg KH Dec. 28, 2021, 2:45 p.m. UTC
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 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.

Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: ocfs2-devel@oss.oracle.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 fs/ocfs2/filecheck.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Joseph Qi Dec. 29, 2021, 1:47 a.m. UTC | #1
Acked-by: Joseph Qi <joseph.qi@linux.alibaba.com>

On 12/28/21 10:45 PM, Greg Kroah-Hartman wrote:
> 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 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.
> 
> Cc: Mark Fasheh <mark@fasheh.com>
> Cc: Joel Becker <jlbec@evilplan.org>
> Cc: Joseph Qi <joseph.qi@linux.alibaba.com>
> Cc: ocfs2-devel@oss.oracle.com
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  fs/ocfs2/filecheck.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/ocfs2/filecheck.c b/fs/ocfs2/filecheck.c
> index de56e6231af8..1ad7106741f8 100644
> --- a/fs/ocfs2/filecheck.c
> +++ b/fs/ocfs2/filecheck.c
> @@ -94,6 +94,7 @@ static struct attribute *ocfs2_filecheck_attrs[] = {
>  	&ocfs2_filecheck_attr_set.attr,
>  	NULL
>  };
> +ATTRIBUTE_GROUPS(ocfs2_filecheck);
>  
>  static void ocfs2_filecheck_release(struct kobject *kobj)
>  {
> @@ -138,7 +139,7 @@ static const struct sysfs_ops ocfs2_filecheck_ops = {
>  };
>  
>  static struct kobj_type ocfs2_ktype_filecheck = {
> -	.default_attrs = ocfs2_filecheck_attrs,
> +	.default_groups = ocfs2_filecheck_groups,
>  	.sysfs_ops = &ocfs2_filecheck_ops,
>  	.release = ocfs2_filecheck_release,
>  };
diff mbox series

Patch

diff --git a/fs/ocfs2/filecheck.c b/fs/ocfs2/filecheck.c
index de56e6231af8..1ad7106741f8 100644
--- a/fs/ocfs2/filecheck.c
+++ b/fs/ocfs2/filecheck.c
@@ -94,6 +94,7 @@  static struct attribute *ocfs2_filecheck_attrs[] = {
 	&ocfs2_filecheck_attr_set.attr,
 	NULL
 };
+ATTRIBUTE_GROUPS(ocfs2_filecheck);
 
 static void ocfs2_filecheck_release(struct kobject *kobj)
 {
@@ -138,7 +139,7 @@  static const struct sysfs_ops ocfs2_filecheck_ops = {
 };
 
 static struct kobj_type ocfs2_ktype_filecheck = {
-	.default_attrs = ocfs2_filecheck_attrs,
+	.default_groups = ocfs2_filecheck_groups,
 	.sysfs_ops = &ocfs2_filecheck_ops,
 	.release = ocfs2_filecheck_release,
 };