Skip to content

Commit 1868f9d

Browse files
committed
Merge tag 'for-linux-6.12-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs update from Mike Marshall: "Constify struct kobj_type" * tag 'for-linux-6.12-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux: orangefs: Constify struct kobj_type
2 parents 056f8c4 + 96319da commit 1868f9d

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

fs/orangefs/orangefs-sysfs.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ static void orangefs_obj_release(struct kobject *kobj)
904904
orangefs_obj = NULL;
905905
}
906906

907-
static struct kobj_type orangefs_ktype = {
907+
static const struct kobj_type orangefs_ktype = {
908908
.sysfs_ops = &orangefs_sysfs_ops,
909909
.default_groups = orangefs_default_groups,
910910
.release = orangefs_obj_release,
@@ -951,7 +951,7 @@ static void acache_orangefs_obj_release(struct kobject *kobj)
951951
acache_orangefs_obj = NULL;
952952
}
953953

954-
static struct kobj_type acache_orangefs_ktype = {
954+
static const struct kobj_type acache_orangefs_ktype = {
955955
.sysfs_ops = &orangefs_sysfs_ops,
956956
.default_groups = acache_orangefs_default_groups,
957957
.release = acache_orangefs_obj_release,
@@ -998,7 +998,7 @@ static void capcache_orangefs_obj_release(struct kobject *kobj)
998998
capcache_orangefs_obj = NULL;
999999
}
10001000

1001-
static struct kobj_type capcache_orangefs_ktype = {
1001+
static const struct kobj_type capcache_orangefs_ktype = {
10021002
.sysfs_ops = &orangefs_sysfs_ops,
10031003
.default_groups = capcache_orangefs_default_groups,
10041004
.release = capcache_orangefs_obj_release,
@@ -1045,7 +1045,7 @@ static void ccache_orangefs_obj_release(struct kobject *kobj)
10451045
ccache_orangefs_obj = NULL;
10461046
}
10471047

1048-
static struct kobj_type ccache_orangefs_ktype = {
1048+
static const struct kobj_type ccache_orangefs_ktype = {
10491049
.sysfs_ops = &orangefs_sysfs_ops,
10501050
.default_groups = ccache_orangefs_default_groups,
10511051
.release = ccache_orangefs_obj_release,
@@ -1092,7 +1092,7 @@ static void ncache_orangefs_obj_release(struct kobject *kobj)
10921092
ncache_orangefs_obj = NULL;
10931093
}
10941094

1095-
static struct kobj_type ncache_orangefs_ktype = {
1095+
static const struct kobj_type ncache_orangefs_ktype = {
10961096
.sysfs_ops = &orangefs_sysfs_ops,
10971097
.default_groups = ncache_orangefs_default_groups,
10981098
.release = ncache_orangefs_obj_release,
@@ -1132,7 +1132,7 @@ static void pc_orangefs_obj_release(struct kobject *kobj)
11321132
pc_orangefs_obj = NULL;
11331133
}
11341134

1135-
static struct kobj_type pc_orangefs_ktype = {
1135+
static const struct kobj_type pc_orangefs_ktype = {
11361136
.sysfs_ops = &orangefs_sysfs_ops,
11371137
.default_groups = pc_orangefs_default_groups,
11381138
.release = pc_orangefs_obj_release,
@@ -1165,7 +1165,7 @@ static void stats_orangefs_obj_release(struct kobject *kobj)
11651165
stats_orangefs_obj = NULL;
11661166
}
11671167

1168-
static struct kobj_type stats_orangefs_ktype = {
1168+
static const struct kobj_type stats_orangefs_ktype = {
11691169
.sysfs_ops = &orangefs_sysfs_ops,
11701170
.default_groups = stats_orangefs_default_groups,
11711171
.release = stats_orangefs_obj_release,

0 commit comments

Comments
 (0)