[Scst-svn] [master] scst: Unbreak the RHEL 9.7 build

[Gleb C. <lna...@ya...>]

Commit: 7d0b1d2
GitHub URL: https://github.com/SCST-project/scst/commit/7d0b1d2588f98625b20b0cd508df188327531470
Author: Gleb Chesnokov
Date: 2025-11-19T11:38:42+03:00
Log Message:
-----------
scst: Unbreak the RHEL 9.7 build

Fixes: https://github.com/SCST-project/scst/issues/317

Modified Paths:
--------------
 .github/workflows/run_regression_tests.yaml |  1 +
 nightly/conf/nightly.conf                   |  1 +
 qla2x00t-32gbit/qla_nvme.c                  | 10 ++++++++--
 qla2x00t-32gbit/qla_os.c                    | 12 +++++++++---
 scst/src/scst_lib.c                         |  5 ++++-
 5 files changed, 23 insertions(+), 6 deletions(-)

===================================================================
diff --git a/.github/workflows/run_regression_tests.yaml b/.github/workflows/run_regression_tests.yaml
index 5e3fd93..c51b808 100644
--- a/.github/workflows/run_regression_tests.yaml
+++ b/.github/workflows/run_regression_tests.yaml
@@ -38,6 +38,7 @@ jobs:
                   '3.18.140',
                   '3.10.108',
                   '6.12.0-55.34.1.el10_0^AlmaLinux^10.0',
+                  '5.14.0-611.5.1.el9_7^AlmaLinux^9.7',
                   '5.14.0-570.46.1.el9_6^AlmaLinux^9.6',
                   '5.14.0-503.40.1.el9_5^AlmaLinux^9.5',
                   '5.14.0-427.42.1.el9_4^AlmaLinux^9.4',
diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index 37791e5..ff7afa5 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -73,6 +73,7 @@ ABT_KERNELS="  \
 3.11.10-nc     \
 3.10.108-nc    \
 6.12.0-55.34.1.el10_0^AlmaLinux^10.0-nc  \
+5.14.0-611.5.1.el9_7^AlmaLinux^9.7-nc    \
 5.14.0-570.46.1.el9_6^AlmaLinux^9.6-nc   \
 5.14.0-503.40.1.el9_5^AlmaLinux^9.5-nc   \
 5.14.0-427.42.1.el9_4^AlmaLinux^9.4-nc   \
diff --git a/qla2x00t-32gbit/qla_nvme.c b/qla2x00t-32gbit/qla_nvme.c
index 2e67893..96dba6a 100644
--- a/qla2x00t-32gbit/qla_nvme.c
+++ b/qla2x00t-32gbit/qla_nvme.c
@@ -13,7 +13,10 @@
 #include <linux/delay.h>
 #include <linux/nvme.h>
 #include <linux/nvme-fc.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0) &&		\
+	(!defined(RHEL_RELEASE_CODE) ||				\
+	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 7) ||	\
+	 RHEL_RELEASE_CODE -0 == RHEL_RELEASE_VERSION(10, 0))
 #include <linux/blk-mq-pci.h>
 #endif
 #include <linux/blk-mq.h>
@@ -869,7 +872,10 @@ static void qla_nvme_map_queues(struct nvme_fc_local_port *lport,
 {
 	struct scsi_qla_host *vha = lport->private;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0) &&		\
+	(!defined(RHEL_RELEASE_CODE) ||				\
+	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 7) ||	\
+	 RHEL_RELEASE_CODE -0 == RHEL_RELEASE_VERSION(10, 0))
 	blk_mq_pci_map_queues(map, vha->hw->pdev, vha->irq_offset);
 #else
 	blk_mq_map_hw_queues(map, &vha->hw->pdev->dev, vha->irq_offset);
diff --git a/qla2x00t-32gbit/qla_os.c b/qla2x00t-32gbit/qla_os.c
index 581e324..ee87d03 100644
--- a/qla2x00t-32gbit/qla_os.c
+++ b/qla2x00t-32gbit/qla_os.c
@@ -14,8 +14,11 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) && \
-	LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0) &&		\
+	LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0) &&	\
+	(!defined(RHEL_RELEASE_CODE) ||				\
+	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 7) ||	\
+	 RHEL_RELEASE_CODE -0 == RHEL_RELEASE_VERSION(10, 0))
 #include <linux/blk-mq-pci.h>
 #endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
@@ -8186,7 +8189,10 @@ static MAP_QUEUES_RET qla2xxx_map_queues(struct Scsi_Host *shost)
 	if (USER_CTRL_IRQ(vha->hw) || !vha->hw->mqiobase)
 		blk_mq_map_queues(qmap);
 	else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0) &&		\
+	(!defined(RHEL_RELEASE_CODE) ||				\
+	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 7) ||	\
+	 RHEL_RELEASE_CODE -0 == RHEL_RELEASE_VERSION(10, 0))
 		blk_mq_pci_map_queues(qmap, vha->hw->pdev, vha->irq_offset);
 #else
 		blk_mq_map_hw_queues(qmap, &vha->hw->pdev->dev,
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index d3fdd2d..a78b7a9 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -8564,7 +8564,10 @@ static struct request *__blk_map_kern_sg(struct request_queue *q,
 
 			TRACE_DBG("len %zd, bytes %zd, offset %zd", len, bytes, offset);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0) &&		\
+	(!defined(RHEL_RELEASE_CODE) ||				\
+	 RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(9, 7) ||	\
+	 RHEL_RELEASE_CODE -0 == RHEL_RELEASE_VERSION(10, 0))
 			rc = bio_add_pc_page(q, bio, page, bytes, offset);
 #else
 			rc = bio_add_page(bio, page, bytes, offset);