6ee9ba5898
* Changelog from Linbit:
9.1.23 (api:genl2/proto:86-101,118-121/transport:18)
--------
* Fix a corner case that can happen when DRBD establishes multiple
connections in parallel, which could lead one connection to end up in
an inconsistent replication state of WFBitMapT/Established
* Fix a corner case in which a reconciliation resync ends up in
WFBitMapT/Established
* Restrict protocol compatibility to the most recent 8.4 and 9.0 releases
* Fix a corner case causing a module ref leak on drbd_transport_tcp;
if it hits, you can not rmmod it
* rate-limit resync progress while resync is paused
* resync-target inherits history UUIDs when resync finishes,
this can prevent unexpected "unrelared data" events later
* Updated compatibility code for Linux 6.11 and 6.12
* remove patches which already included in the new version:
0001-drbd-properly-rate-limit-resync-progress-reports.patch
0002-drbd-inherit-history-UUIDs-from-sync-source-when-res.patch
0003-build-compat-fix-line-offset-in-annotation-pragmas-p.patch
0004-drbd-fix-exposed_uuid-going-backward.patch
0005-drbd-Proper-locking-around-new_current_uuid-on-a-dis.patch
0006-build-CycloneDX-fix-bom-ref-add-purl.patch
0007-build-Another-update-to-the-spdx-files.patch
0008-build-generate-spdx.json-not-tag-value-format.patch
0009-compat-fix-gen_patch_names-for-bdev_file_open_by_pat.patch
0010-compat-fix-nla_nest_start_noflag-test.patch
0011-compat-fix-blk_alloc_disk-rule.patch
0012-drbd-remove-const-from-function-return-type.patch
0013-drbd-don-t-set-max_write_zeroes_sectors-in-decide_on.patch
0014-drbd-split-out-a-drbd_discard_supported-helper.patch
0015-drbd-atomically-update-queue-limits-in-drbd_reconsid.patch
0016-compat-test-and-patch-for-queue_limits_start_update.patch
0017-compat-specify-which-essential-change-was-not-made.patch
0018-gen_patch_names-reorder-blk_mode_t.patch
0019-compat-fix-blk_queue_update_readahead-patch.patch
0020-compat-test-and-patch-for-que_limits-max_hw_discard_.patch
0021-compat-fixup-write_zeroes__no_capable.patch
0022-compat-fixup-queue_flag_discard__yes_present.patch
0023-drbd-move-flags-to-queue_limits.patch
0024-compat-test-and-patch-for-queue_limits.features.patch
0025-drbd-Annotate-struct-fifo_buffer-with-__counted_by.patch
0026-compat-test-and-patch-for-__counted_by.patch
0027-drbd-fix-function-cast-warnings-in-state-machine.patch
0028-Add-missing-documentation-of-peer_device-parameter-t.patch
0030-drbd-kref_put-path-when-kernel_accept-fails.patch
0031-build-fix-typo-in-Makefile.spatch.patch
0032-drbd-open-do-not-delay-open-if-already-Primary.patch
* removed patch which is not needed anymore:
boo1231290_fix_drbd_build_error_against_kernel_v6.11.0.patch
boo1233222_fix_drbd_build_error_against_kernel_v6.11.6.patch
* update:
drbd_git_revision
drbd.spec
* add upstream patches to align commit d64ebe7eb7df:
0001-drbd-Fix-memory-leak.patch
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=155
76 lines
2.8 KiB
Diff
76 lines
2.8 KiB
Diff
From 5a09ad97f57eb276dc1e9a84e1c82f11ce1fe1b7 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?=
|
|
<christoph.boehmwalder@linbit.com>
|
|
Date: Thu, 4 Apr 2024 15:53:31 +0200
|
|
Subject: [PATCH 1/3] compat: fixup FMODE_READ/FMODE_WRITE usage
|
|
|
|
Fixes: 4a84d1d0 ("compat: block: replace fmode_t with a block-specific type for block open flags")
|
|
---
|
|
.../cocci/blk_mode_t__no_present.cocci | 15 +++++++++++++++
|
|
drbd/drbd-kernel-compat/gen_patch_names.c | 6 +++---
|
|
drbd/drbd_nl.c | 2 +-
|
|
3 files changed, 19 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drbd/drbd-kernel-compat/cocci/blk_mode_t__no_present.cocci b/drbd/drbd-kernel-compat/cocci/blk_mode_t__no_present.cocci
|
|
index 030723c817de..d1312a093ffe 100644
|
|
--- a/drbd/drbd-kernel-compat/cocci/blk_mode_t__no_present.cocci
|
|
+++ b/drbd/drbd-kernel-compat/cocci/blk_mode_t__no_present.cocci
|
|
@@ -17,3 +17,18 @@ identifier mode;
|
|
)
|
|
...>
|
|
}
|
|
+
|
|
+@@
|
|
+@@
|
|
+// special case: bdev_open_by_path takes a blk_mode_t, so convert that too. I can't seem to get
|
|
+// coccinelle to match the "READ | WRITE" condition generically, so just hard code it.
|
|
+// NOTE: we use blkdev_get_by_path instead of bdev_open_by_path in some compat cases, so support that too.
|
|
+(
|
|
+bdev_open_by_path
|
|
+|
|
|
+blkdev_get_by_path
|
|
+)
|
|
+ (...,
|
|
+- BLK_OPEN_READ | BLK_OPEN_WRITE
|
|
++ FMODE_READ | FMODE_WRITE
|
|
+ , ...)
|
|
diff --git a/drbd/drbd-kernel-compat/gen_patch_names.c b/drbd/drbd-kernel-compat/gen_patch_names.c
|
|
index b136acf3148a..86a7ce7a93ed 100644
|
|
--- a/drbd/drbd-kernel-compat/gen_patch_names.c
|
|
+++ b/drbd/drbd-kernel-compat/gen_patch_names.c
|
|
@@ -565,15 +565,15 @@ int main(int argc, char **argv)
|
|
patch(1, "block_device_operations_open", true, false,
|
|
COMPAT_BLOCK_DEVICE_OPERATIONS_OPEN_TAKES_GENDISK, "takes_gendisk");
|
|
|
|
- patch(1, "blkdev_put", true, false,
|
|
- COMPAT_BLKDEV_PUT_HAS_HOLDER, "has_holder");
|
|
-
|
|
patch(1, "block_device_operations_release", true, false,
|
|
COMPAT_BLOCK_DEVICE_OPERATIONS_RELEASE_TAKES_SINGLE_ARGUMENT, "takes_single_argument");
|
|
|
|
patch(1, "blk_mode_t", true, false,
|
|
COMPAT_HAVE_BLK_MODE_T, "present");
|
|
|
|
+ patch(1, "blkdev_put", true, false,
|
|
+ COMPAT_BLKDEV_PUT_HAS_HOLDER, "has_holder");
|
|
+
|
|
patch(1, "genl_info_userhdr", true, false,
|
|
COMPAT_HAVE_GENL_INFO_USERHDR, "present");
|
|
|
|
diff --git a/drbd/drbd_nl.c b/drbd/drbd_nl.c
|
|
index d41ccfcd4bb2..a355f5d5feb1 100644
|
|
--- a/drbd/drbd_nl.c
|
|
+++ b/drbd/drbd_nl.c
|
|
@@ -2566,7 +2566,7 @@ static struct block_device *open_backing_dev(struct drbd_device *device,
|
|
const char *bdev_path, void *claim_ptr)
|
|
{
|
|
struct block_device *bdev = blkdev_get_by_path(bdev_path,
|
|
- FMODE_READ | FMODE_WRITE,
|
|
+ BLK_OPEN_READ | BLK_OPEN_WRITE,
|
|
claim_ptr, NULL);
|
|
if (IS_ERR(bdev)) {
|
|
drbd_err(device, "open(\"%s\") failed with %ld\n",
|
|
--
|
|
2.44.0
|
|
|