Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 176ef3c4 authored by Kimberly Brown's avatar Kimberly Brown Committed by Jaegeuk Kim
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.

Fixes: fef4129e ("f2fs: fix to be aware discard/preflush/dio command in is_idle()")
Signed-off-by: default avatarKimberly Brown <kimbrownkd@gmail.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 4d3aed70

fs/f2fs/sysfs.c

+4 −2
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ static struct attribute *f2fs_attrs[] = { 
	ATTR_LIST(current_reserved_blocks),

	NULL,

};

ATTRIBUTE_GROUPS(f2fs);



static struct attribute *f2fs_feat_attrs[] = {

#ifdef CONFIG_FS_ENCRYPTION
@@ -536,6 +537,7 @@ static struct attribute *f2fs_feat_attrs[] = { 
	ATTR_LIST(sb_checksum),

	NULL,

};

ATTRIBUTE_GROUPS(f2fs_feat);



static const struct sysfs_ops f2fs_attr_ops = {

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



static struct kobj_type f2fs_sb_ktype = {

	.default_attrs	= f2fs_attrs,

	.default_groups = f2fs_groups,

	.sysfs_ops	= &f2fs_attr_ops,

	.release	= f2fs_sb_release,

};
@@ -557,7 +559,7 @@ static struct kset f2fs_kset = { 
};



static struct kobj_type f2fs_feat_ktype = {

	.default_attrs	= f2fs_feat_attrs,

	.default_groups = f2fs_feat_groups,

	.sysfs_ops	= &f2fs_attr_ops,

};