2022-01-14 10:48:30

by Greg Kroah-Hartman

[permalink] [raw]
Subject: [PATCH v2] ubifs: 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 ubifs 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.

Cc: Richard Weinberger <[email protected]>
Cc: Stefan Schaeckeler <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
v2: fix up the changelog text to properly refer to the ubifs code
instead of some other subsystem as pointed out by Michael Walle

fs/ubifs/sysfs.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/ubifs/sysfs.c b/fs/ubifs/sysfs.c
index 7acc5a74e5fa..06ad8fa1fcfb 100644
--- a/fs/ubifs/sysfs.c
+++ b/fs/ubifs/sysfs.c
@@ -42,6 +42,7 @@ static struct attribute *ubifs_attrs[] = {
ATTR_LIST(errors_crc),
NULL,
};
+ATTRIBUTE_GROUPS(ubifs);

static ssize_t ubifs_attr_show(struct kobject *kobj,
struct attribute *attr, char *buf)
@@ -74,7 +75,7 @@ static const struct sysfs_ops ubifs_attr_ops = {
};

static struct kobj_type ubifs_sb_ktype = {
- .default_attrs = ubifs_attrs,
+ .default_groups = ubifs_groups,
.sysfs_ops = &ubifs_attr_ops,
.release = ubifs_sb_release,
};
--
2.34.1



2022-01-14 23:09:08

by Richard Weinberger

[permalink] [raw]
Subject: Re: [PATCH v2] ubifs: use default_groups in kobj_type

----- Urspr√ľngliche Mail -----
> Von: "Greg Kroah-Hartman" <[email protected]>
> An: "linux-kernel" <[email protected]>
> CC: "Greg Kroah-Hartman" <[email protected]>, "richard" <[email protected]>, "schaecsn" <[email protected]>,
> "linux-mtd" <[email protected]>
> Gesendet: Freitag, 14. Januar 2022 11:48:20
> Betreff: [PATCH v2] ubifs: 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 ubifs 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.
>
> Cc: Richard Weinberger <[email protected]>
> Cc: Stefan Schaeckeler <[email protected]>
> Cc: [email protected]
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
> ---
> v2: fix up the changelog text to properly refer to the ubifs code
> instead of some other subsystem as pointed out by Michael Walle

Acked-by: Richard Weinberger <[email protected]>

Thanks,
//richard