Commit dad4afe7 authored by Kimberly Brown's avatar Kimberly Brown Committed by Greg Kroah-Hartman
Browse files

f2fs: replace ktype default_attrs with default_groups



The kobj_type default_attrs field is being replaced by the
default_groups field. Replace the default_attrs fields in f2fs_sb_ktype
and f2fs_feat_ktype with default_groups. Use the ATTRIBUTE_GROUPS macro
to create f2fs_groups and f2fs_feat_groups.

Signed-off-by: default avatarKimberly Brown <kimbrownkd@gmail.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c9c5b5e1
Loading
Loading
Loading
Loading
+4 −2
Original line number Original line Diff line number Diff line
@@ -501,6 +501,7 @@ static struct attribute *f2fs_attrs[] = {
	ATTR_LIST(current_reserved_blocks),
	ATTR_LIST(current_reserved_blocks),
	NULL,
	NULL,
};
};
ATTRIBUTE_GROUPS(f2fs);


static struct attribute *f2fs_feat_attrs[] = {
static struct attribute *f2fs_feat_attrs[] = {
#ifdef CONFIG_FS_ENCRYPTION
#ifdef CONFIG_FS_ENCRYPTION
@@ -520,6 +521,7 @@ static struct attribute *f2fs_feat_attrs[] = {
	ATTR_LIST(sb_checksum),
	ATTR_LIST(sb_checksum),
	NULL,
	NULL,
};
};
ATTRIBUTE_GROUPS(f2fs_feat);


static const struct sysfs_ops f2fs_attr_ops = {
static const struct sysfs_ops f2fs_attr_ops = {
	.show	= f2fs_attr_show,
	.show	= f2fs_attr_show,
@@ -527,7 +529,7 @@ static const struct sysfs_ops f2fs_attr_ops = {
};
};


static struct kobj_type f2fs_sb_ktype = {
static struct kobj_type f2fs_sb_ktype = {
	.default_attrs	= f2fs_attrs,
	.default_groups = f2fs_groups,
	.sysfs_ops	= &f2fs_attr_ops,
	.sysfs_ops	= &f2fs_attr_ops,
	.release	= f2fs_sb_release,
	.release	= f2fs_sb_release,
};
};
@@ -541,7 +543,7 @@ static struct kset f2fs_kset = {
};
};


static struct kobj_type f2fs_feat_ktype = {
static struct kobj_type f2fs_feat_ktype = {
	.default_attrs	= f2fs_feat_attrs,
	.default_groups = f2fs_feat_groups,
	.sysfs_ops	= &f2fs_attr_ops,
	.sysfs_ops	= &f2fs_attr_ops,
};
};