Commit a6b9a614 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

nilfs2: 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 nilfs2 code to use default_groups field which has been
the preferred way since aa30f47c ("kobject: Add support for default
attribute groups to kobj_type") so that we can soon get rid of the
obsolete default_attrs field.

Acked-by: default avatarRyusuke Konishi <konishi.ryusuke@gmail.com>
Link: https://lore.kernel.org/r/20211228144252.390554-1-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf6299b6

fs/nilfs2/sysfs.c

+10 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void nilfs_##name##_attr_release(struct kobject *kobj) \ 
	complete(&subgroups->sg_##name##_kobj_unregister); \

} \

static struct kobj_type nilfs_##name##_ktype = { \

	.default_attrs	= nilfs_##name##_attrs, \

	.default_groups	= nilfs_##name##_groups, \

	.sysfs_ops	= &nilfs_##name##_attr_ops, \

	.release	= nilfs_##name##_attr_release, \

}
@@ -129,6 +129,7 @@ static struct attribute *nilfs_snapshot_attrs[] = { 
	NILFS_SNAPSHOT_ATTR_LIST(README),

	NULL,

};

ATTRIBUTE_GROUPS(nilfs_snapshot);



static ssize_t nilfs_snapshot_attr_show(struct kobject *kobj,

					struct attribute *attr, char *buf)
@@ -166,7 +167,7 @@ static const struct sysfs_ops nilfs_snapshot_attr_ops = { 
};



static struct kobj_type nilfs_snapshot_ktype = {

	.default_attrs	= nilfs_snapshot_attrs,

	.default_groups	= nilfs_snapshot_groups,

	.sysfs_ops	= &nilfs_snapshot_attr_ops,

	.release	= nilfs_snapshot_attr_release,

};
@@ -226,6 +227,7 @@ static struct attribute *nilfs_mounted_snapshots_attrs[] = { 
	NILFS_MOUNTED_SNAPSHOTS_ATTR_LIST(README),

	NULL,

};

ATTRIBUTE_GROUPS(nilfs_mounted_snapshots);



NILFS_DEV_INT_GROUP_OPS(mounted_snapshots, dev);

NILFS_DEV_INT_GROUP_TYPE(mounted_snapshots, dev);
@@ -339,6 +341,7 @@ static struct attribute *nilfs_checkpoints_attrs[] = { 
	NILFS_CHECKPOINTS_ATTR_LIST(README),

	NULL,

};

ATTRIBUTE_GROUPS(nilfs_checkpoints);



NILFS_DEV_INT_GROUP_OPS(checkpoints, dev);

NILFS_DEV_INT_GROUP_TYPE(checkpoints, dev);
@@ -428,6 +431,7 @@ static struct attribute *nilfs_segments_attrs[] = { 
	NILFS_SEGMENTS_ATTR_LIST(README),

	NULL,

};

ATTRIBUTE_GROUPS(nilfs_segments);



NILFS_DEV_INT_GROUP_OPS(segments, dev);

NILFS_DEV_INT_GROUP_TYPE(segments, dev);
@@ -689,6 +693,7 @@ static struct attribute *nilfs_segctor_attrs[] = { 
	NILFS_SEGCTOR_ATTR_LIST(README),

	NULL,

};

ATTRIBUTE_GROUPS(nilfs_segctor);



NILFS_DEV_INT_GROUP_OPS(segctor, dev);

NILFS_DEV_INT_GROUP_TYPE(segctor, dev);
@@ -816,6 +821,7 @@ static struct attribute *nilfs_superblock_attrs[] = { 
	NILFS_SUPERBLOCK_ATTR_LIST(README),

	NULL,

};

ATTRIBUTE_GROUPS(nilfs_superblock);



NILFS_DEV_INT_GROUP_OPS(superblock, dev);

NILFS_DEV_INT_GROUP_TYPE(superblock, dev);
@@ -924,6 +930,7 @@ static struct attribute *nilfs_dev_attrs[] = { 
	NILFS_DEV_ATTR_LIST(README),

	NULL,

};

ATTRIBUTE_GROUPS(nilfs_dev);



static ssize_t nilfs_dev_attr_show(struct kobject *kobj,

				    struct attribute *attr, char *buf)
@@ -961,7 +968,7 @@ static const struct sysfs_ops nilfs_dev_attr_ops = { 
};



static struct kobj_type nilfs_dev_ktype = {

	.default_attrs	= nilfs_dev_attrs,

	.default_groups	= nilfs_dev_groups,

	.sysfs_ops	= &nilfs_dev_attr_ops,

	.release	= nilfs_dev_attr_release,

};