LU-16291 build: make kobj_type constant

Kernel v5.16-rc2-28-gee6d3dd4ed48:
commit ee6d3dd4ed48ab24b74bab3c3977b8218518247d
driver core: make kobj_type constant.

This patch makes struct kobj_type constant to fix
the following build failure against kernel 5.16:

lustre/obdclass/obd_config.c: In function 'class_modify_config':
lustre/obdclass/obd_config.c:1639:13: error: assignment discards
'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
1639 |         typ = get_ktype(kobj);
     |             ^

Lustre-change: https://review.whamcloud.com/49043
Lustre-commit: d1dbf26afd6676e02a2a00e635b9ad1fe14cf68e

Signed-off-by: Jian Yu <yujian@whamcloud.com>
Change-Id: I19e0d1f4e3cf97f6871e038487cda9294ac1f67b
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/49835
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>

diff --git a/lustre/mgs/lproc_mgs.c b/lustre/mgs/lproc_mgs.c
index 91738e6..ddc0671 100644 (file)
--- a/lustre/mgs/lproc_mgs.c
+++ b/lustre/mgs/lproc_mgs.c
@@ -261,7 +261,7 @@ int lproc_mgs_setup(struct mgs_device *mgs, const char *osd_name)
 {
        int osd_len = strlen(osd_name) - strlen("-osd");
        struct obd_device *obd = mgs->mgs_obd;
-       struct kobj_type *bottom_type;
+       const struct kobj_type *bottom_type;
        struct obd_device *osd_obd;
        int rc;
        int i;

diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c
index 8a07475..61c4c5f 100644 (file)
--- a/lustre/obdclass/obd_config.c
+++ b/lustre/obdclass/obd_config.c
@@ -1660,7 +1660,7 @@ EXPORT_SYMBOL(class_process_config);
 ssize_t class_modify_config(struct lustre_cfg *lcfg, const char *prefix,
                            struct kobject *kobj)
 {
-       struct kobj_type *typ;
+       const struct kobj_type *typ;
        ssize_t count = 0;
        int i;
 

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 1a4b67d..bb1ae40 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -726,7 +726,7 @@ static void ofd_procfs_add_brw_stats_symlink(struct ofd_device *ofd)
 {
        struct obd_device *obd = ofd_obd(ofd);
        struct obd_device *osd_obd = ofd->ofd_osd_exp->exp_obd;
-       struct kobj_type *osd_type;
+       const struct kobj_type *osd_type;
        int i;
 
        osd_type = get_ktype(&ofd->ofd_osd->dd_kobj);