Commit 2ee83335 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Darrick J. Wong
Browse files

xfs: make kobj_type structures constant 



Since commit ee6d3dd4 ("driver core: make kobj_type constant.")
the driver core allows the usage of const struct kobj_type.

Take advantage of this to constify the structure definitions to prevent
modification at runtime.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 167ce4cb

fs/xfs/xfs_error.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static struct attribute *xfs_errortag_attrs[] = { 
};

ATTRIBUTE_GROUPS(xfs_errortag);



static struct kobj_type xfs_errortag_ktype = {

static const struct kobj_type xfs_errortag_ktype = {

	.release = xfs_sysfs_release,

	.sysfs_ops = &xfs_errortag_sysfs_ops,

	.default_groups = xfs_errortag_groups,

fs/xfs/xfs_sysfs.c

+6 −6
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static struct attribute *xfs_mp_attrs[] = { 
};

ATTRIBUTE_GROUPS(xfs_mp);



struct kobj_type xfs_mp_ktype = {

const struct kobj_type xfs_mp_ktype = {

	.release = xfs_sysfs_release,

	.sysfs_ops = &xfs_sysfs_ops,

	.default_groups = xfs_mp_groups,
@@ -266,7 +266,7 @@ static struct attribute *xfs_dbg_attrs[] = { 
};

ATTRIBUTE_GROUPS(xfs_dbg);



struct kobj_type xfs_dbg_ktype = {

const struct kobj_type xfs_dbg_ktype = {

	.release = xfs_sysfs_release,

	.sysfs_ops = &xfs_sysfs_ops,

	.default_groups = xfs_dbg_groups,
@@ -324,7 +324,7 @@ static struct attribute *xfs_stats_attrs[] = { 
};

ATTRIBUTE_GROUPS(xfs_stats);



struct kobj_type xfs_stats_ktype = {

const struct kobj_type xfs_stats_ktype = {

	.release = xfs_sysfs_release,

	.sysfs_ops = &xfs_sysfs_ops,

	.default_groups = xfs_stats_groups,
@@ -410,7 +410,7 @@ static struct attribute *xfs_log_attrs[] = { 
};

ATTRIBUTE_GROUPS(xfs_log);



struct kobj_type xfs_log_ktype = {

const struct kobj_type xfs_log_ktype = {

	.release = xfs_sysfs_release,

	.sysfs_ops = &xfs_sysfs_ops,

	.default_groups = xfs_log_groups,
@@ -564,13 +564,13 @@ static struct attribute *xfs_error_attrs[] = { 
};

ATTRIBUTE_GROUPS(xfs_error);



static struct kobj_type xfs_error_cfg_ktype = {

static const struct kobj_type xfs_error_cfg_ktype = {

	.release = xfs_sysfs_release,

	.sysfs_ops = &xfs_sysfs_ops,

	.default_groups = xfs_error_groups,

};



static struct kobj_type xfs_error_ktype = {

static const struct kobj_type xfs_error_ktype = {

	.release = xfs_sysfs_release,

	.sysfs_ops = &xfs_sysfs_ops,

};

fs/xfs/xfs_sysfs.h

+5 −5
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ 
#ifndef __XFS_SYSFS_H__

#define __XFS_SYSFS_H__



extern struct kobj_type xfs_mp_ktype;	/* xfs_mount */

extern struct kobj_type xfs_dbg_ktype;	/* debug */

extern struct kobj_type xfs_log_ktype;	/* xlog */

extern struct kobj_type xfs_stats_ktype;	/* stats */

extern const struct kobj_type xfs_mp_ktype;	/* xfs_mount */

extern const struct kobj_type xfs_dbg_ktype;	/* debug */

extern const struct kobj_type xfs_log_ktype;	/* xlog */

extern const struct kobj_type xfs_stats_ktype;	/* stats */



static inline struct xfs_kobj *

to_kobj(struct kobject *kobject)
@@ -28,7 +28,7 @@ xfs_sysfs_release(struct kobject *kobject) 
static inline int

xfs_sysfs_init(

	struct xfs_kobj		*kobj,

	struct kobj_type	*ktype,

	const struct kobj_type	*ktype,

	struct xfs_kobj		*parent_kobj,

	const char		*name)

{