From ca72e6dc08bda9fd45c388163d199b115a65066f Mon Sep 17 00:00:00 2001 From: Mira Date: Thu, 18 Dec 2025 15:08:02 +0100 Subject: [KERNEL] Fix build on RHEL 9.7 & 10.1 Co-authored-by: Simon Rettberg --- src/kernel/blk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/kernel') diff --git a/src/kernel/blk.c b/src/kernel/blk.c index eaed1cd..bc5cfd5 100644 --- a/src/kernel/blk.c +++ b/src/kernel/blk.c @@ -41,7 +41,8 @@ static int dnbd3_close_device(dnbd3_device_t *dev) /* new requests might have been queued up, */ /* but now that imgname is NULL no new ones can show up */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0) \ + && !RHEL_CHECK_VERSION(RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 7) && RHEL_RELEASE_CODE != RHEL_RELEASE_VERSION(10, 0)) blk_mq_freeze_queue(dev->queue); set_capacity(dev->disk, 0); blk_mq_unfreeze_queue(dev->queue); @@ -431,7 +432,8 @@ int dnbd3_blk_add_device(dnbd3_device_t *dev, int minor) dev->tag_set.queue_depth = 128; dev->tag_set.numa_node = NUMA_NO_NODE; dev->tag_set.cmd_size = sizeof(struct dnbd3_cmd); -#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0) \ + && !RHEL_CHECK_VERSION(RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 7) && RHEL_RELEASE_CODE != RHEL_RELEASE_VERSION(10, 0)) dev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE; #endif dev->tag_set.driver_data = dev; -- cgit v1.2.3-55-g7522