29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
From 1f9910c9a54b424ad0cd415b981986937618c4ec Mon Sep 17 00:00:00 2001
|
|
From: Rok Mandeljc <rok.mandeljc@gmail.com>
|
|
Date: Mon, 3 Feb 2025 21:05:32 +0100
|
|
Subject: VHBA: fix building with kernel 6.14-rc1
|
|
|
|
Kernel 6.14-rc1 simplified the selection of tag allocation policy.
|
|
Instead of enum-based value, a boolean is used, and the corresponding
|
|
field in the `scsi_host_template` structure was renamed from
|
|
`tag_alloc_policy` to `tag_alloc_policy_rr`.
|
|
|
|
See: https://github.com/torvalds/linux/commit/ce32496
|
|
---
|
|
drivers/scsi/vhba/vhba.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/scsi/vhba/vhba.c
|
|
+++ b/drivers/scsi/vhba/vhba.c
|
|
@@ -537,7 +537,9 @@ static struct scsi_host_template vhba_te
|
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
|
|
.slave_alloc = vhba_slave_alloc,
|
|
#endif
|
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)
|
|
+ .tag_alloc_policy_rr = true,
|
|
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
|
|
.tag_alloc_policy = BLK_TAG_ALLOC_RR,
|
|
#endif
|
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0)
|