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
81 lines
3.3 KiB
Diff
81 lines
3.3 KiB
Diff
From c34a13c3df85352124e94456f81e3d4ba4f52440 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Moritz=20=22WanzenBug=22=20Wanzenb=C3=B6ck?=
|
|
<moritz.wanzenboeck@linbit.com>
|
|
Date: Fri, 8 Sep 2023 12:20:10 +0200
|
|
Subject: [PATCH 08/20] compat: block: introduce holder ops
|
|
|
|
See also upstream Linux kernel commit
|
|
0718afd47f70 ("block: introduce holder ops")
|
|
|
|
Original message:
|
|
|
|
Add a new blk_holder_ops structure, which is passed to blkdev_get_by_* and
|
|
installed in the block_device for exclusive claims. It will be used to
|
|
allow the block layer to call back into the user of the block device for
|
|
thing like notification of a removed device or a device resize.
|
|
---
|
|
.../cocci/blkdev_get_by_path__no_has_holder_ops.cocci | 6 ++++++
|
|
drbd/drbd-kernel-compat/gen_patch_names.c | 3 +++
|
|
.../tests/blkdev_get_by_path_has_holder_ops.c | 7 +++++++
|
|
drbd/drbd_nl.c | 3 ++-
|
|
4 files changed, 18 insertions(+), 1 deletion(-)
|
|
create mode 100644 drbd/drbd-kernel-compat/cocci/blkdev_get_by_path__no_has_holder_ops.cocci
|
|
create mode 100644 drbd/drbd-kernel-compat/tests/blkdev_get_by_path_has_holder_ops.c
|
|
|
|
diff --git a/drbd/drbd-kernel-compat/cocci/blkdev_get_by_path__no_has_holder_ops.cocci b/drbd/drbd-kernel-compat/cocci/blkdev_get_by_path__no_has_holder_ops.cocci
|
|
new file mode 100644
|
|
index 000000000000..050d89e6fe0d
|
|
--- /dev/null
|
|
+++ b/drbd/drbd-kernel-compat/cocci/blkdev_get_by_path__no_has_holder_ops.cocci
|
|
@@ -0,0 +1,6 @@
|
|
+@@
|
|
+expression path, mode, holder, ops;
|
|
+@@
|
|
+ blkdev_get_by_path(path, mode, holder
|
|
+- , ops
|
|
+ )
|
|
diff --git a/drbd/drbd-kernel-compat/gen_patch_names.c b/drbd/drbd-kernel-compat/gen_patch_names.c
|
|
index 959bbc351e1b..7071a0a4c5ec 100644
|
|
--- a/drbd/drbd-kernel-compat/gen_patch_names.c
|
|
+++ b/drbd/drbd-kernel-compat/gen_patch_names.c
|
|
@@ -556,6 +556,9 @@ int main(int argc, char **argv)
|
|
patch(1, "__bio_add_page", true, false,
|
|
COMPAT_HAVE___BIO_ADD_PAGE, "present");
|
|
|
|
+ patch(1, "blkdev_get_by_path", true, false,
|
|
+ COMPAT_BLKDEV_GET_BY_PATH_HAS_HOLDER_OPS, "has_holder_ops");
|
|
+
|
|
/* #define BLKDEV_ISSUE_ZEROOUT_EXPORTED */
|
|
/* #define BLKDEV_ZERO_NOUNMAP */
|
|
|
|
diff --git a/drbd/drbd-kernel-compat/tests/blkdev_get_by_path_has_holder_ops.c b/drbd/drbd-kernel-compat/tests/blkdev_get_by_path_has_holder_ops.c
|
|
new file mode 100644
|
|
index 000000000000..02a560782f37
|
|
--- /dev/null
|
|
+++ b/drbd/drbd-kernel-compat/tests/blkdev_get_by_path_has_holder_ops.c
|
|
@@ -0,0 +1,7 @@
|
|
+/* { "version": "v6.5-rc1", "commit": "0718afd47f70cf46877c39c25d06b786e1a3f36c", "comment": "block: introduce holder ops", "author": "Christoph Hellwig <hch@lst.de>", "date": "Thu Jun 1 11:44:52 2023 +0200" } */
|
|
+#include <linux/blkdev.h>
|
|
+
|
|
+struct block_device *foo(const char *bdev_path, struct blk_holder_ops *ops)
|
|
+{
|
|
+ return blkdev_get_by_path(bdev_path, 0, NULL, ops);
|
|
+}
|
|
diff --git a/drbd/drbd_nl.c b/drbd/drbd_nl.c
|
|
index 0fc1d84a996f..0a67bfa4ca52 100644
|
|
--- a/drbd/drbd_nl.c
|
|
+++ b/drbd/drbd_nl.c
|
|
@@ -2560,7 +2560,8 @@ 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 | FMODE_EXCL, claim_ptr);
|
|
+ FMODE_READ | FMODE_WRITE | FMODE_EXCL,
|
|
+ claim_ptr, NULL);
|
|
if (IS_ERR(bdev)) {
|
|
drbd_err(device, "open(\"%s\") failed with %ld\n",
|
|
bdev_path, PTR_ERR(bdev));
|
|
--
|
|
2.35.3
|
|
|