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
79 lines
2.7 KiB
Diff
79 lines
2.7 KiB
Diff
By heming.zhao@suse.com
|
|
|
|
This patch was updated/changed after boo#1230635
|
|
|
|
----
|
|
|
|
diff -Nupr a/drbd/drbd-kernel-compat/tests/have_bdev_open_by_path.c b/drbd/drbd-kernel-compat/tests/have_bdev_open_by_path.c
|
|
--- a/drbd/drbd-kernel-compat/tests/have_bdev_open_by_path.c 2024-06-19 15:02:47.050694378 +0800
|
|
+++ b/drbd/drbd-kernel-compat/tests/have_bdev_open_by_path.c 2024-06-19 15:11:39.313298178 +0800
|
|
@@ -2,7 +2,7 @@
|
|
|
|
#include <linux/blkdev.h>
|
|
|
|
-struct bdev_handle *foo(const char *path, blk_mode_t mode, void *holder,
|
|
- const struct blk_holder_ops *hops) {
|
|
- return bdev_open_by_path(path, mode, holder, hops);
|
|
+void foo(void)
|
|
+{
|
|
+ return;
|
|
}
|
|
diff -Nupr a/drbd/drbd-kernel-compat/tests/have_blk_alloc_disk.c b/drbd/drbd-kernel-compat/tests/have_blk_alloc_disk.c
|
|
--- a/drbd/drbd-kernel-compat/tests/have_blk_alloc_disk.c 2024-06-19 11:35:39.957400039 +0800
|
|
+++ b/drbd/drbd-kernel-compat/tests/have_blk_alloc_disk.c 2024-06-19 11:36:43.594396686 +0800
|
|
@@ -2,7 +2,17 @@
|
|
|
|
#include <linux/blkdev.h>
|
|
|
|
+#define DRBD_MAX_BIO_SIZE_SAFE (1U << 12) /* Works always = 4k */
|
|
+
|
|
struct gendisk *foo(int node)
|
|
{
|
|
- return blk_alloc_disk(node);
|
|
+ struct queue_limits lim = {
|
|
+ /*
|
|
+ * Setting the max_hw_sectors to an odd value of 8kibyte here.
|
|
+ * This triggers a max_bio_size message upon first attach or
|
|
+ * connect.
|
|
+ */
|
|
+ .max_hw_sectors = DRBD_MAX_BIO_SIZE_SAFE >> 8,
|
|
+ };
|
|
+ return blk_alloc_disk(&lim, node);
|
|
}
|
|
diff -Nupr a/drbd/drbd_main.c b/drbd/drbd_main.c
|
|
--- a/drbd/drbd_main.c 2024-06-19 11:41:59.409367593 +0800
|
|
+++ b/drbd/drbd_main.c 2024-06-19 11:41:40.052600574 +0800
|
|
@@ -3752,6 +3752,7 @@ static int init_submitter(struct drbd_de
|
|
return 0;
|
|
}
|
|
|
|
+#define DRBD_MAX_BIO_SIZE_SAFE (1U << 12) /* Works always = 4k */
|
|
enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsigned int minor,
|
|
struct device_conf *device_conf, struct drbd_device **p_device)
|
|
{
|
|
@@ -3767,6 +3768,15 @@ enum drbd_ret_code drbd_create_device(st
|
|
enum drbd_ret_code err = ERR_NOMEM;
|
|
bool locked = false;
|
|
|
|
+ struct queue_limits lim = {
|
|
+ /*
|
|
+ * Setting the max_hw_sectors to an odd value of 8kibyte here.
|
|
+ * This triggers a max_bio_size message upon first attach or
|
|
+ * connect.
|
|
+ */
|
|
+ .max_hw_sectors = DRBD_MAX_BIO_SIZE_SAFE >> 8,
|
|
+ };
|
|
+
|
|
lockdep_assert_held(&resource->conf_update);
|
|
|
|
device = minor_to_device(minor);
|
|
@@ -3824,7 +3834,7 @@ enum drbd_ret_code drbd_create_device(st
|
|
|
|
init_rwsem(&device->uuid_sem);
|
|
|
|
- disk = blk_alloc_disk(NUMA_NO_NODE);
|
|
+ disk = blk_alloc_disk(&lim, NUMA_NO_NODE);
|
|
if (!disk)
|
|
goto out_no_disk;
|
|
|