diff -ruN scst-3.9/fcst/ft_scst.c scst-3.9-patched/fcst/ft_scst.c --- scst-3.9/fcst/ft_scst.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/fcst/ft_scst.c 2025-07-21 08:17:57.995358243 -0400 @@ -85,7 +85,7 @@ MODULE_AUTHOR("Joe Eykholt "); MODULE_DESCRIPTION("SCST FCoE target driver v" FT_VERSION); MODULE_LICENSE("GPL v2"); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); module_init(ft_module_init); module_exit(ft_module_exit); diff -ruN scst-3.9/iscsi-scst/kernel/conn.c scst-3.9-patched/iscsi-scst/kernel/conn.c --- scst-3.9/iscsi-scst/kernel/conn.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/iscsi-scst/kernel/conn.c 2025-07-21 08:18:33.045356619 -0400 @@ -26,6 +26,9 @@ #include "iscsi.h" #include "digest.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + #if defined(CONFIG_LOCKDEP) && !defined(CONFIG_SCST_PROC) static struct lock_class_key scst_conn_key; static struct lockdep_map scst_conn_dep_map = diff -ruN scst-3.9/iscsi-scst/kernel/event.c scst-3.9-patched/iscsi-scst/kernel/event.c --- scst-3.9/iscsi-scst/kernel/event.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/iscsi-scst/kernel/event.c 2025-07-21 08:18:45.658356035 -0400 @@ -25,6 +25,9 @@ #include "iscsi_trace_flag.h" #include "iscsi.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + struct net *iscsi_net_ns; EXPORT_SYMBOL(iscsi_net_ns); diff -ruN scst-3.9/iscsi-scst/kernel/iscsi.c scst-3.9-patched/iscsi-scst/kernel/iscsi.c --- scst-3.9/iscsi-scst/kernel/iscsi.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/iscsi-scst/kernel/iscsi.c 2025-07-21 08:18:57.183355501 -0400 @@ -31,6 +31,9 @@ #include "iscsi.h" #include "digest.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + #define ISCSI_INIT_WRITE_WAKE 0x1 static int ctr_major; @@ -4296,5 +4299,5 @@ MODULE_VERSION(ISCSI_VERSION_STRING); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); MODULE_DESCRIPTION("SCST iSCSI Target"); diff -ruN scst-3.9/iscsi-scst/kernel/iscsit_transport.c scst-3.9-patched/iscsi-scst/kernel/iscsit_transport.c --- scst-3.9/iscsi-scst/kernel/iscsit_transport.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/iscsi-scst/kernel/iscsit_transport.c 2025-07-21 08:19:08.744354965 -0400 @@ -8,6 +8,9 @@ #endif #include "iscsi.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + static LIST_HEAD(transport_list); static DEFINE_MUTEX(transport_mutex); diff -ruN scst-3.9/iscsi-scst/kernel/isert-scst/isert.c scst-3.9-patched/iscsi-scst/kernel/isert-scst/isert.c --- scst-3.9/iscsi-scst/kernel/isert-scst/isert.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/iscsi-scst/kernel/isert-scst/isert.c 2025-07-21 08:17:58.020358241 -0400 @@ -498,7 +498,7 @@ MODULE_AUTHOR("Yan Burman"); MODULE_LICENSE("Dual BSD/GPL"); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); #define DRV_VERSION "3.9.0" "#" __stringify(OFED_FLAVOR) #define DRV_RELDATE "28 December 2024" MODULE_DESCRIPTION("iSER target transport driver v" DRV_VERSION " (" DRV_RELDATE ")"); diff -ruN scst-3.9/iscsi-scst/kernel/nthread.c scst-3.9-patched/iscsi-scst/kernel/nthread.c --- scst-3.9/iscsi-scst/kernel/nthread.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/iscsi-scst/kernel/nthread.c 2025-07-21 08:19:23.264354292 -0400 @@ -29,6 +29,9 @@ #include "iscsi.h" #include "digest.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + /* Read data states */ enum rx_state { RX_INIT_BHS, /* Must be zero for better "switch" optimization. */ diff -ruN scst-3.9/iscsi-scst/kernel/target.c scst-3.9-patched/iscsi-scst/kernel/target.c --- scst-3.9/iscsi-scst/kernel/target.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/iscsi-scst/kernel/target.c 2025-07-21 08:19:36.975353657 -0400 @@ -21,6 +21,9 @@ #include "iscsi.h" #include "digest.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + #define MAX_NR_TARGETS (1UL << 30) DEFINE_MUTEX(target_mgmt_mutex); diff -ruN scst-3.9/qla2x00t/Kbuild scst-3.9-patched/qla2x00t/Kbuild --- scst-3.9/qla2x00t/Kbuild 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/qla2x00t/Kbuild 2025-07-21 08:21:20.399348866 -0400 @@ -1,7 +1,7 @@ -ccflags-y += -I$(src)/../scst/include -DDEFAULT_SYMBOL_NAMESPACE=QLA16GB +ccflags-y := -I$(src)/../scst/include ifneq ($(CONFIG_SCSI_QLA2XXX_TARGET),) -ccflags-y += -DCONFIG_SCSI_QLA2XXX_TARGET=$(CONFIG_SCSI_QLA2XXX_TARGET) +ccflags-y += -DCONFIG_SCSI_QLA2XXX_TARGET=$(CONFIG_SCSI_QLA2XXX_TARGET) endif obj-m := qla2xxx_scst.o diff -ruN scst-3.9/qla2x00t/qla2x00-target/qla2x00t.c scst-3.9-patched/qla2x00t/qla2x00-target/qla2x00t.c --- scst-3.9/qla2x00t/qla2x00-target/qla2x00t.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/qla2x00t/qla2x00-target/qla2x00t.c 2025-07-21 08:22:03.408346873 -0400 @@ -7092,6 +7092,6 @@ MODULE_AUTHOR("Vladislav Bolkhovitin and others"); MODULE_DESCRIPTION("Target mode addon for qla2[2,3,4,5+]xx"); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(SCST); -MODULE_IMPORT_NS(QLA16GB); +MODULE_IMPORT_NS(SCST_NAMESPACE); +MODULE_IMPORT_NS(SCST_QLA16_NAMESPACE); MODULE_VERSION(Q2T_VERSION_STRING); diff -ruN scst-3.9/qla2x00t/qla_init.c scst-3.9-patched/qla2x00t/qla_init.c --- scst-3.9/qla2x00t/qla_init.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/qla2x00t/qla_init.c 2025-07-21 08:22:18.759346162 -0400 @@ -22,6 +22,9 @@ #include "qla2x_tgt.h" #endif +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_QLA16_NAMESPACE + /* * QLogic ISP2x00 Hardware Support Function Prototypes. */ diff -ruN scst-3.9/qla2x00t/qla_iocb.c scst-3.9-patched/qla2x00t/qla_iocb.c --- scst-3.9/qla2x00t/qla_iocb.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/qla2x00t/qla_iocb.c 2025-07-21 08:22:34.390345438 -0400 @@ -12,6 +12,10 @@ #include #include "qla2x_tgt.h" + +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_QLA16_NAMESPACE + static void qla25xx_set_que(srb_t *, struct rsp_que **); /* diff -ruN scst-3.9/qla2x00t/qla_mbx.c scst-3.9-patched/qla2x00t/qla_mbx.c --- scst-3.9/qla2x00t/qla_mbx.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/qla2x00t/qla_mbx.c 2025-07-21 08:22:54.617344501 -0400 @@ -12,6 +12,9 @@ #include +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_QLA16_NAMESPACE + /* * qla2x00_mailbox_command * Issue mailbox command and waits for completion. @@ -5021,4 +5024,3 @@ return rval; } - diff -ruN scst-3.9/qla2x00t/qla_mid.c scst-3.9-patched/qla2x00t/qla_mid.c --- scst-3.9/qla2x00t/qla_mid.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/qla2x00t/qla_mid.c 2025-07-21 08:23:02.868344119 -0400 @@ -19,6 +19,9 @@ #include "qla2x_tgt.h" #endif +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_QLA16_NAMESPACE + void qla2x00_vp_stop_timer(scsi_qla_host_t *vha) { diff -ruN scst-3.9/qla2x00t/qla_os.c scst-3.9-patched/qla2x00t/qla_os.c --- scst-3.9/qla2x00t/qla_os.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/qla2x00t/qla_os.c 2025-07-21 08:23:07.879343887 -0400 @@ -18,6 +18,9 @@ #include #include +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_QLA16_NAMESPACE + /* * Driver version */ diff -ruN scst-3.9/qla2x00t-32gbit/Kbuild scst-3.9-patched/qla2x00t-32gbit/Kbuild --- scst-3.9/qla2x00t-32gbit/Kbuild 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/qla2x00t-32gbit/Kbuild 2025-07-21 08:20:10.607352099 -0400 @@ -1,8 +1,7 @@ -ccflags-y += -I$(src)/../scst/include -I$(src)/include \ - -DDEFAULT_SYMBOL_NAMESPACE=QLA32GB +ccflags-y := -I$(src)/../scst/include -I$(src)/include ifneq ($(CONFIG_SCSI_QLA2XXX_TARGET),) -ccflags-y += -DCONFIG_SCSI_QLA2XXX_TARGET=$(CONFIG_SCSI_QLA2XXX_TARGET) +ccflags-y += -DCONFIG_SCSI_QLA2XXX_TARGET=$(CONFIG_SCSI_QLA2XXX_TARGET) endif obj-m := qla2xxx_scst.o diff -ruN scst-3.9/qla2x00t-32gbit/qla2x00-target/qla_tgt.c scst-3.9-patched/qla2x00t-32gbit/qla2x00-target/qla_tgt.c --- scst-3.9/qla2x00t-32gbit/qla2x00-target/qla_tgt.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/qla2x00t-32gbit/qla2x00-target/qla_tgt.c 2025-07-21 08:20:28.379351276 -0400 @@ -44,6 +44,9 @@ #include "qla_def.h" #include "scst_qla2xxx.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_QLA32_NAMESPACE + size_t qlt_add_vtarget(u64 port_name, u64 node_name, u64 parent_host) { struct fc_vport *vport; diff -ruN scst-3.9/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c scst-3.9-patched/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c --- scst-3.9/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c 2025-07-21 08:20:44.679350521 -0400 @@ -2202,6 +2202,6 @@ MODULE_DESCRIPTION("SCST Cavium adapter target interface driver."); MODULE_LICENSE("GPL"); -MODULE_IMPORT_NS(SCST); -MODULE_IMPORT_NS(QLA32GB); +MODULE_IMPORT_NS(SCST_NAMESPACE); +MODULE_IMPORT_NS(SCST_QLA32_NAMESPACE); MODULE_VERSION(SQA_VERSION); diff -ruN scst-3.9/qla2x00t-32gbit/qla_target.c scst-3.9-patched/qla2x00t-32gbit/qla_target.c --- scst-3.9/qla2x00t-32gbit/qla_target.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/qla2x00t-32gbit/qla_target.c 2025-07-21 08:21:06.336349517 -0400 @@ -30,6 +30,9 @@ #include "qla_def.h" #include "qla_target.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_QLA32_NAMESPACE + /* * See also commit fb3269baf4ec ("qla2xxx: Add selective command queuing") * # v4.5. diff -ruN scst-3.9/scst/include/backport.h scst-3.9-patched/scst/include/backport.h --- scst-3.9/scst/include/backport.h 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/include/backport.h 2025-07-21 08:24:02.818341342 -0400 @@ -1003,7 +1005,21 @@ #endif /* */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) + +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0) +#define SCST_NAMESPACE SCST +#define SCST_QLA16_NAMESPACE QLA16GB +#define SCST_QLA32_NAMESPACE QLA32GB +#else +#define SCST_NAMESPACE "SCST" +#define SCST_QLA16_NAMESPACE "QLA16GB" +#define SCST_QLA32_NAMESPACE "QLA32GB" +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) +#undef MODULE_IMPORT_NS +#define MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, __stringify(ns)) +#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) #define MODULE_IMPORT_NS(ns) #endif diff -ruN scst-3.9/scst/src/dev_handlers/scst_cdrom.c scst-3.9-patched/scst/src/dev_handlers/scst_cdrom.c --- scst-3.9/scst/src/dev_handlers/scst_cdrom.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/dev_handlers/scst_cdrom.c 2025-07-21 08:17:58.013358242 -0400 @@ -232,4 +232,4 @@ MODULE_AUTHOR("Vladislav Bolkhovitin & Leonid Stoljar"); MODULE_DESCRIPTION("SCSI CDROM (type 5) dev handler for SCST"); MODULE_VERSION(SCST_VERSION_STRING); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); diff -ruN scst-3.9/scst/src/dev_handlers/scst_changer.c scst-3.9-patched/scst/src/dev_handlers/scst_changer.c --- scst-3.9/scst/src/dev_handlers/scst_changer.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/dev_handlers/scst_changer.c 2025-07-21 08:17:58.013358242 -0400 @@ -184,4 +184,4 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SCSI medium changer (type 8) dev handler for SCST"); MODULE_VERSION(SCST_VERSION_STRING); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); diff -ruN scst-3.9/scst/src/dev_handlers/scst_disk.c scst-3.9-patched/scst/src/dev_handlers/scst_disk.c --- scst-3.9/scst/src/dev_handlers/scst_disk.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/dev_handlers/scst_disk.c 2025-07-21 08:17:58.011358242 -0400 @@ -750,4 +750,4 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SCSI disk (type 0) dev handler for SCST"); MODULE_VERSION(SCST_VERSION_STRING); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); diff -ruN scst-3.9/scst/src/dev_handlers/scst_modisk.c scst-3.9-patched/scst/src/dev_handlers/scst_modisk.c --- scst-3.9/scst/src/dev_handlers/scst_modisk.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/dev_handlers/scst_modisk.c 2025-07-21 08:17:58.011358242 -0400 @@ -317,4 +317,4 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SCSI MO disk (type 7) dev handler for SCST"); MODULE_VERSION(SCST_VERSION_STRING); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); diff -ruN scst-3.9/scst/src/dev_handlers/scst_processor.c scst-3.9-patched/scst/src/dev_handlers/scst_processor.c --- scst-3.9/scst/src/dev_handlers/scst_processor.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/dev_handlers/scst_processor.c 2025-07-21 08:17:58.011358242 -0400 @@ -184,4 +184,4 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SCSI medium processor (type 3) dev handler for SCST"); MODULE_VERSION(SCST_VERSION_STRING); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); diff -ruN scst-3.9/scst/src/dev_handlers/scst_raid.c scst-3.9-patched/scst/src/dev_handlers/scst_raid.c --- scst-3.9/scst/src/dev_handlers/scst_raid.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/dev_handlers/scst_raid.c 2025-07-21 08:17:58.011358242 -0400 @@ -184,4 +184,4 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SCSI raid(controller) (type 0xC) dev handler for SCST"); MODULE_VERSION(SCST_VERSION_STRING); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); diff -ruN scst-3.9/scst/src/dev_handlers/scst_tape.c scst-3.9-patched/scst/src/dev_handlers/scst_tape.c --- scst-3.9/scst/src/dev_handlers/scst_tape.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/dev_handlers/scst_tape.c 2025-07-21 08:17:58.011358242 -0400 @@ -338,4 +338,4 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SCSI tape (type 1) dev handler for SCST"); MODULE_VERSION(SCST_VERSION_STRING); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); diff -ruN scst-3.9/scst/src/dev_handlers/scst_user.c scst-3.9-patched/scst/src/dev_handlers/scst_user.c --- scst-3.9/scst/src/dev_handlers/scst_user.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/dev_handlers/scst_user.c 2025-07-21 08:17:58.011358242 -0400 @@ -4133,4 +4133,4 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("User space device handler for SCST"); MODULE_VERSION(SCST_VERSION_STRING); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); diff -ruN scst-3.9/scst/src/dev_handlers/scst_vdisk.c scst-3.9-patched/scst/src/dev_handlers/scst_vdisk.c --- scst-3.9/scst/src/dev_handlers/scst_vdisk.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/dev_handlers/scst_vdisk.c 2025-07-21 08:17:58.014358242 -0400 @@ -9971,4 +9973,4 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("SCSI disk (type 0) and CDROM (type 5) dev handler for SCST using files on file systems or block devices"); MODULE_VERSION(SCST_VERSION_STRING); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); diff -ruN scst-3.9/scst/src/Kbuild scst-3.9-patched/scst/src/Kbuild --- scst-3.9/scst/src/Kbuild 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/Kbuild 2025-07-21 08:24:34.095339893 -0400 @@ -1,9 +1,7 @@ -# See also Documentation/core-api/symbol-namespaces.rst for more information -# about DEFAULT_SYMBOL_NAMESPACE. -ccflags-y += -I$(src)/../include \ - -DDEFAULT_SYMBOL_NAMESPACE=SCST \ - $(shell [ -n "${CONFIG_SCST_NO_DLM}" ] && echo -DCONFIG_SCST_NO_DLM) \ - $(shell [ -n "${REVISION}" ] && echo -DSCST_REVISION=${REVISION}) +ccflags-y := -I$(src)/../include + +ccflags-y += $(shell [ -n "${CONFIG_SCST_NO_DLM}" ] && echo -DCONFIG_SCST_NO_DLM) \ + $(shell [ -n "${REVISION}" ] && echo -DSCST_REVISION=${REVISION}) #ccflags-y += -DCONFIG_SCST_STRICT_SERIALIZING #ccflags-y += -DCONFIG_SCST_USE_EXPECTED_VALUES diff -ruN scst-3.9/scst/src/scst_copy_mgr.c scst-3.9-patched/scst/src/scst_copy_mgr.c --- scst-3.9/scst/src/scst_copy_mgr.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/scst_copy_mgr.c 2025-07-21 08:25:17.404337886 -0400 @@ -18,6 +18,8 @@ #include "scst_priv.h" #include "scst_pres.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE #define SCST_CM_NAME "copy_manager" #define SCST_CM_TGT_NAME (SCST_CM_NAME "_tgt") diff -ruN scst-3.9/scst/src/scst_debug.c scst-3.9-patched/scst/src/scst_debug.c --- scst-3.9/scst/src/scst_debug.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/scst_debug.c 2025-07-21 08:25:30.267337290 -0400 @@ -32,6 +32,9 @@ #include "scst_debug.h" #endif +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) #define TRACE_BUF_SIZE 512 diff -ruN scst-3.9/scst/src/scst_event.c scst-3.9-patched/scst/src/scst_event.c --- scst-3.9/scst/src/scst_event.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/scst_event.c 2025-07-21 08:25:35.408337052 -0400 @@ -29,6 +29,9 @@ #include "scst_priv.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + static struct workqueue_struct *scst_event_wq; static struct class *scst_event_sysfs_class; diff -ruN scst-3.9/scst/src/scst_main.c scst-3.9-patched/scst/src/scst_main.c --- scst-3.9/scst/src/scst_main.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/scst_main.c 2025-07-21 08:25:59.619335931 -0400 @@ -40,6 +40,9 @@ #include "scst_mem.h" #include "scst_pres.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + #if defined(CONFIG_HIGHMEM4G) || defined(CONFIG_HIGHMEM64G) #warning HIGHMEM kernel configurations are fully supported, but not \ recommended for performance reasons. Consider changing VMSPLIT \ diff -ruN scst-3.9/scst/src/scst_mem.c scst-3.9-patched/scst/src/scst_mem.c --- scst-3.9/scst/src/scst_mem.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/scst_mem.c 2025-07-21 08:26:03.219335764 -0400 @@ -34,6 +34,9 @@ #include "scst_priv.h" #include "scst_mem.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + #define SGV_DEFAULT_PURGE_INTERVAL (60 * HZ) #define SGV_MIN_SHRINK_INTERVAL (1 * HZ) diff -ruN scst-3.9/scst/src/scst_pres.c scst-3.9-patched/scst/src/scst_pres.c --- scst-3.9/scst/src/scst_pres.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/scst_pres.c 2025-07-21 08:26:15.860335178 -0400 @@ -59,6 +59,9 @@ #include #endif +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + #define SCST_PR_ROOT_ENTRY "pr" #define SCST_PR_FILE_SIGN 0xBBEEEEAAEEBBDD77LLU #define SCST_PR_FILE_VERSION 1LLU diff -ruN scst-3.9/scst/src/scst_sysfs.c scst-3.9-patched/scst/src/scst_sysfs.c --- scst-3.9/scst/src/scst_sysfs.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/scst_sysfs.c 2025-07-21 08:26:22.005334894 -0400 @@ -34,6 +34,9 @@ #include "scst_pres.h" #include "scst_mem.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + #ifdef CONFIG_LOCKDEP static struct lock_class_key scst_tgtt_key; static struct lockdep_map scst_tgtt_dep_map = diff -ruN scst-3.9/scst/src/scst_targ.c scst-3.9-patched/scst/src/scst_targ.c --- scst-3.9/scst/src/scst_targ.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/scst_targ.c 2025-07-21 08:26:26.091334704 -0400 @@ -43,6 +43,9 @@ #include "scst_priv.h" #include "scst_pres.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + static void scst_cmd_set_sn(struct scst_cmd *cmd); static int __scst_init_cmd(struct scst_cmd *cmd); static struct scst_cmd *__scst_find_cmd_by_tag(struct scst_session *sess, diff -ruN scst-3.9/scst/src/scst_tg.c scst-3.9-patched/scst/src/scst_tg.c --- scst-3.9/scst/src/scst_tg.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst/src/scst_tg.c 2025-07-21 08:26:33.681334353 -0400 @@ -28,6 +28,9 @@ #include "scst_priv.h" #include "scst_pres.h" +#undef DEFAULT_SYMBOL_NAMESPACE +#define DEFAULT_SYMBOL_NAMESPACE SCST_NAMESPACE + struct alua_state_and_name { enum scst_tg_state s; char *n; diff -ruN scst-3.9/scst_local/scst_local.c scst-3.9-patched/scst_local/scst_local.c --- scst-3.9/scst_local/scst_local.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/scst_local/scst_local.c 2025-07-21 08:17:58.002358242 -0400 @@ -149,7 +149,7 @@ MODULE_DESCRIPTION("SCSI+SCST local adapter driver"); MODULE_LICENSE("GPL"); MODULE_VERSION(SCST_LOCAL_VERSION); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); static int scst_local_get_sas_transport_id(struct scst_local_sess *sess, uint8_t **transport_id, int *len) diff -ruN scst-3.9/srpt/src/ib_srpt.c scst-3.9-patched/srpt/src/ib_srpt.c --- scst-3.9/srpt/src/ib_srpt.c 2024-12-28 08:44:09.000000000 -0500 +++ scst-3.9-patched/srpt/src/ib_srpt.c 2025-07-21 08:17:58.007358242 -0400 @@ -75,7 +75,7 @@ MODULE_DESCRIPTION("SCSI RDMA Protocol target driver " "v" DRV_VERSION " (" DRV_RELDATE ")"); MODULE_LICENSE("Dual BSD/GPL"); -MODULE_IMPORT_NS(SCST); +MODULE_IMPORT_NS(SCST_NAMESPACE); /* * Global Variables