linux-kernel - Re: [PATCH] ocfs2: cluster: use default_groups in kobj

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <0dd319cf-8e2e-e378-368f-e419d5f9b6a6@linux.alibaba.com>
Date:   Thu, 6 Jan 2022 19:29:24 +0800
From:   Joseph Qi <joseph.qi@...ux.alibaba.com>
To:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        linux-kernel@...r.kernel.org
Cc:     Mark Fasheh <mark@...heh.com>, Joel Becker <jlbec@...lplan.org>,
        Masahiro Yamada <masahiroy@...nel.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Miguel Ojeda <ojeda@...nel.org>,
        Geert Uytterhoeven <geert@...ux-m68k.org>,
        ocfs2-devel@....oracle.com
Subject: Re: [PATCH] ocfs2: cluster: use default_groups in kobj_type

Reviewed-and-Tested-by: Joseph Qi <joseph.qi@...ux.alibaba.com>

On 1/6/22 6:20 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 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.
> 
> Cc: Mark Fasheh <mark@...heh.com>
> Cc: Joel Becker <jlbec@...lplan.org>
> Cc: Joseph Qi <joseph.qi@...ux.alibaba.com>
> Cc: Masahiro Yamada <masahiroy@...nel.org>
> Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> Cc: Andrew Morton <akpm@...ux-foundation.org>
> Cc: Miguel Ojeda <ojeda@...nel.org>
> Cc: Geert Uytterhoeven <geert@...ux-m68k.org>
> Cc: ocfs2-devel@....oracle.com
> Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> ---
>  fs/ocfs2/cluster/masklog.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
> index 810d32815593..563881ddbf00 100644
> --- a/fs/ocfs2/cluster/masklog.c
> +++ b/fs/ocfs2/cluster/masklog.c
> @@ -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;