xfs: sysfs: use default_groups in kobj_type
PATCH 1/1 xfs: sysfs: 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 xfs 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/xfs/xfs_error.c | 3 ++- fs/xfs/xfs_sysfs.c | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-)
fs/xfs/xfs_error.c +2 -1
@@ -213,11 +213,12 @@ static struct attribute *xfs_errortag_attrs[] = {XFS_ERRORTAG_ATTR_LIST (ag_resv_fail),NULL , }; +ATTRIBUTE_GROUPS (xfs_errortag);static struct kobj_type xfs_errortag_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_errortag_sysfs_ops, - .default_attrs = xfs_errortag_attrs, + .default_groups = xfs_errortag_groups, };int
fs/xfs/xfs_sysfs.c +10 -6
@@ -67,11 +67,12 @@ static const struct sysfs_ops xfs_sysfs_ops = {static struct attribute *xfs_mp_attrs[] = {NULL , }; +ATTRIBUTE_GROUPS (xfs_mp);struct kobj_type xfs_mp_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_sysfs_ops, - .default_attrs = xfs_mp_attrs, + .default_groups = xfs_mp_groups, };#ifdef DEBUG
@@ -239,11 +240,12 @@ static struct attribute *xfs_dbg_attrs[] = {#endif NULL , }; +ATTRIBUTE_GROUPS (xfs_dbg);struct kobj_type xfs_dbg_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_sysfs_ops, - .default_attrs = xfs_dbg_attrs, + .default_groups = xfs_dbg_groups, };#endif /* DEBUG */
@@ -296,11 +298,12 @@ static struct attribute *xfs_stats_attrs[] = {ATTR_LIST (stats_clear),NULL , }; +ATTRIBUTE_GROUPS (xfs_stats);struct kobj_type xfs_stats_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_sysfs_ops, - .default_attrs = xfs_stats_attrs, + .default_groups = xfs_stats_groups, };/* xlog */
@@ -381,11 +384,12 @@ static struct attribute *xfs_log_attrs[] = {ATTR_LIST (write_grant_head),NULL , }; +ATTRIBUTE_GROUPS (xfs_log);struct kobj_type xfs_log_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_sysfs_ops, - .default_attrs = xfs_log_attrs, + .default_groups = xfs_log_groups, };/*
@@ -534,12 +538,12 @@ static struct attribute *xfs_error_attrs[] = {ATTR_LIST (retry_timeout_seconds),NULL , }; - +ATTRIBUTE_GROUPS (xfs_error );static struct kobj_type xfs_error_cfg_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_sysfs_ops, - .default_attrs = xfs_error_attrs, + .default_groups = xfs_error_groups, };static struct kobj_type xfs_error_ktype = {
Signature · 1 line
2.34.1
Quoted 10 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 xfs 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 "Darrick J. Wong" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Looks good to me. Shall I take this through the xfs tree?
--D
Quoted 101 lines
--- fs/xfs/xfs_error.c | 3 ++- fs/xfs/xfs_sysfs.c | 16 ++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-)fs/xfs/xfs_error.c +2
-1@@ -213,11 +213,12 @@ static struct attribute *xfs_errortag_attrs[] = {XFS_ERRORTAG_ATTR_LIST (ag_resv_fail),NULL , }; +ATTRIBUTE_GROUPS (xfs_errortag);static struct kobj_type xfs_errortag_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_errortag_sysfs_ops, - .default_attrs = xfs_errortag_attrs, + .default_groups = xfs_errortag_groups, };int fs/xfs/xfs_sysfs.c +10
-6@@ -67,11 +67,12 @@ static const struct sysfs_ops xfs_sysfs_ops = {static struct attribute *xfs_mp_attrs[] = {NULL , }; +ATTRIBUTE_GROUPS (xfs_mp);struct kobj_type xfs_mp_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_sysfs_ops, - .default_attrs = xfs_mp_attrs, + .default_groups = xfs_mp_groups, };#ifdef DEBUG @@ -239,11 +240,12 @@ static struct attribute *xfs_dbg_attrs[] = {#endif NULL , }; +ATTRIBUTE_GROUPS (xfs_dbg);struct kobj_type xfs_dbg_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_sysfs_ops, - .default_attrs = xfs_dbg_attrs, + .default_groups = xfs_dbg_groups, };#endif /* DEBUG */ @@ -296,11 +298,12 @@ static struct attribute *xfs_stats_attrs[] = {ATTR_LIST (stats_clear),NULL , }; +ATTRIBUTE_GROUPS (xfs_stats);struct kobj_type xfs_stats_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_sysfs_ops, - .default_attrs = xfs_stats_attrs, + .default_groups = xfs_stats_groups, };/* xlog */ @@ -381,11 +384,12 @@ static struct attribute *xfs_log_attrs[] = {ATTR_LIST (write_grant_head),NULL , }; +ATTRIBUTE_GROUPS (xfs_log);struct kobj_type xfs_log_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_sysfs_ops, - .default_attrs = xfs_log_attrs, + .default_groups = xfs_log_groups, };/* @@ -534,12 +538,12 @@ static struct attribute *xfs_error_attrs[] = {ATTR_LIST (retry_timeout_seconds),NULL , }; - +ATTRIBUTE_GROUPS (xfs_error );static struct kobj_type xfs_error_cfg_ktype = { .release = xfs_sysfs_release, .sysfs_ops = &xfs_sysfs_ops, - .default_attrs = xfs_error_attrs, + .default_groups = xfs_error_groups, };static struct kobj_type xfs_error_ktype = {Signature · 1 line
2.34.1
Quoted 8 lines · Darrick J. Wong
Quoted 7 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 xfs 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.
Quoted 7 lines
Quoted 3 lines
Cc "Darrick J. Wong" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Looks good to me. Shall I take this through the xfs tree?
Reviewed-by Darrick J. Wong <[email protected]>
Please feel free to. Or if you do not want to, I can take it through my trees, which ever is easier for you, just let me know.
thanks,
greg k-h
Quoted 13 lines · Greg Kroah-Hartman
Quoted 12 lines · Darrick J. Wong
Quoted 10 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 xfs 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 "Darrick J. Wong" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 6 lines
Quoted 3 lines
Looks good to me. Shall I take this through the xfs tree?
Reviewed-by Darrick J. Wong <[email protected]>Please feel free to. Or if you do not want to, I can take it through my trees, which ever is easier for you, just let me know.
I'll put it in my tree, thanks for freshening the sysfs code! :)
--D
Quoted 3 lines
thanks,
greg k-h