From d1dbf26afd6676e02a2a00e635b9ad1fe14cf68e Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Fri, 2 Dec 2022 11:27:43 -0800 Subject: [PATCH] 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); | ^ Signed-off-by: Jian Yu Change-Id: I19e0d1f4e3cf97f6871e038487cda9294ac1f67b Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49043 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin Reviewed-by: Shaun Tancheff Reviewed-by: Andreas Dilger --- lustre/mgs/lproc_mgs.c | 2 +- lustre/obdclass/obd_config.c | 2 +- lustre/ofd/ofd_dev.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/mgs/lproc_mgs.c b/lustre/mgs/lproc_mgs.c index 7e8c3f1..c0b0fa6 100644 --- a/lustre/mgs/lproc_mgs.c +++ b/lustre/mgs/lproc_mgs.c @@ -260,7 +260,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 0d37443..b8610e3 100644 --- a/lustre/obdclass/obd_config.c +++ b/lustre/obdclass/obd_config.c @@ -1627,7 +1627,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 d69ff06..fdc110d 100644 --- 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); -- 1.8.3.1