From 2a154a146ea0374a5d9661e7c955ffe163b12e06 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 14 Nov 2025 14:42:19 +0100
Subject: [KERNEL] Update src to support 6.14+

---
 src/kernel/blk.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/kernel')

diff --git a/src/kernel/blk.c b/src/kernel/blk.c
index 84f0163..8c6f9a0 100644
--- a/src/kernel/blk.c
+++ b/src/kernel/blk.c
@@ -30,6 +30,7 @@
 static int dnbd3_close_device(dnbd3_device_t *dev)
 {
 	int result;
+	unsigned int mf;
 
 	if (dev->imgname)
 		dev_info(dnbd3_device_to_dev(dev), "closing down device.\n");
@@ -41,9 +42,15 @@ 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)
 	blk_mq_freeze_queue(dev->queue);
 	set_capacity(dev->disk, 0);
 	blk_mq_unfreeze_queue(dev->queue);
+#else
+	mf = blk_mq_freeze_queue(dev->queue);
+	set_capacity(dev->disk, 0);
+	blk_mq_unfreeze_queue(dev->queue, mf);
+#endif
 	return result;
 }
 
@@ -421,7 +428,9 @@ 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)
 	dev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
+#endif
 	dev->tag_set.driver_data = dev;
 	dev->tag_set.timeout = BLOCK_LAYER_TIMEOUT * HZ;
 
-- 
cgit v1.2.3-55-g7522