heming zhao
e6b9fc6e91
- drbd: fix build error against kernel v6.15 (boo#1244669)
* add upstream patch
+ 0001-compat-follow-Linux-6.14-debugfs_change_name.patch
* add suse special patch
+ boo1244669-fix_build_error_against_kernel_v6.15.patch
* remove patch which is replaced by the upstream patch
- boo1240916-fix_build_error_against_kernel_v6.14.patch
OBS-URL: https://build.opensuse.org/request/show/1286295
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=159
30 lines
1014 B
Diff
30 lines
1014 B
Diff
From 32b84f7b4d071312e5e812eab6b26e4aad2899e4 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?=
|
|
<christoph.boehmwalder@linbit.com>
|
|
Date: Mon, 19 Aug 2024 16:19:47 +0200
|
|
Subject: [PATCH 11/32] compat: fix blk_alloc_disk rule
|
|
|
|
---
|
|
drbd/drbd-kernel-compat/gen_patch_names.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drbd/drbd-kernel-compat/gen_patch_names.c b/drbd/drbd-kernel-compat/gen_patch_names.c
|
|
index 7549ee39afb7..c21a43b39488 100644
|
|
--- a/drbd/drbd-kernel-compat/gen_patch_names.c
|
|
+++ b/drbd/drbd-kernel-compat/gen_patch_names.c
|
|
@@ -155,9 +155,10 @@ int main(int argc, char **argv)
|
|
|
|
patch(1, "blk_alloc_disk", true, false,
|
|
COMPAT_BLK_ALLOC_DISK_TAKES_QUEUE_LIMITS, "takes_queue_limits");
|
|
-
|
|
+#if !defined(COMPAT_BLK_ALLOC_DISK_TAKES_QUEUE_LIMITS)
|
|
patch(1, "blk_alloc_disk", true, false,
|
|
COMPAT_HAVE_BLK_ALLOC_DISK, "present");
|
|
+#endif
|
|
|
|
/*******************************************************************************/
|
|
/*
|
|
--
|
|
2.35.3
|
|
|