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

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

block: Replace all ktype default_attrs with groups 



The kobj_type default_attrs field is being replaced by the
default_groups field. Replace all of the ktype default_attrs fields in
the block subsystem with default_groups and use the ATTRIBUTE_GROUPS
macro to create the default groups.

Remove default_ctx_attrs[] because it doesn't contain any attributes.

This patch was tested by verifying that the sysfs files for the
attributes in the default groups were created.

Signed-off-by: default avatarKimberly Brown <kimbrownkd@gmail.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c484a678

block/blk-integrity.c

+2 −1
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ static struct attribute *integrity_attrs[] = { 
	&integrity_device_entry.attr,

	NULL,

};

ATTRIBUTE_GROUPS(integrity);



static const struct sysfs_ops integrity_ops = {

	.show	= &integrity_attr_show,
@@ -372,7 +373,7 @@ static const struct sysfs_ops integrity_ops = { 
};



static struct kobj_type integrity_ktype = {

	.default_attrs	= integrity_attrs,

	.default_groups = integrity_groups,

	.sysfs_ops	= &integrity_ops,

};

block/blk-mq-sysfs.c

+2 −6
Original line number Diff line number Diff line
@@ -173,10 +173,6 @@ static ssize_t blk_mq_hw_sysfs_cpus_show(struct blk_mq_hw_ctx *hctx, char *page) 
	return ret;

}



static struct attribute *default_ctx_attrs[] = {

	NULL,

};



static struct blk_mq_hw_ctx_sysfs_entry blk_mq_hw_sysfs_nr_tags = {

	.attr = {.name = "nr_tags", .mode = 0444 },

	.show = blk_mq_hw_sysfs_nr_tags_show,
@@ -196,6 +192,7 @@ static struct attribute *default_hw_ctx_attrs[] = { 
	&blk_mq_hw_sysfs_cpus.attr,

	NULL,

};

ATTRIBUTE_GROUPS(default_hw_ctx);



static const struct sysfs_ops blk_mq_sysfs_ops = {

	.show	= blk_mq_sysfs_show,
@@ -214,13 +211,12 @@ static struct kobj_type blk_mq_ktype = { 


static struct kobj_type blk_mq_ctx_ktype = {

	.sysfs_ops	= &blk_mq_sysfs_ops,

	.default_attrs	= default_ctx_attrs,

	.release	= blk_mq_ctx_sysfs_release,

};



static struct kobj_type blk_mq_hw_ktype = {

	.sysfs_ops	= &blk_mq_hw_sysfs_ops,

	.default_attrs	= default_hw_ctx_attrs,

	.default_groups = default_hw_ctx_groups,

	.release	= blk_mq_hw_sysfs_release,

};

block/blk-sysfs.c

+2 −1
Original line number Diff line number Diff line
@@ -769,6 +769,7 @@ static struct attribute *default_attrs[] = { 
#endif

	NULL,

};

ATTRIBUTE_GROUPS(default);



#define to_queue(atr) container_of((atr), struct queue_sysfs_entry, attr)
@@ -890,7 +891,7 @@ static const struct sysfs_ops queue_sysfs_ops = { 


struct kobj_type blk_queue_ktype = {

	.sysfs_ops	= &queue_sysfs_ops,

	.default_attrs	= default_attrs,

	.default_groups = default_groups,

	.release	= blk_release_queue,

};