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
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
diff -Nupr a/drbd/drbd_nl.c b/drbd/drbd_nl.c
|
|
--- a/drbd/drbd_nl.c 2024-08-12 15:03:18.458476462 +0800
|
|
+++ b/drbd/drbd_nl.c 2024-08-12 15:05:08.415670056 +0800
|
|
@@ -2017,6 +2017,55 @@ static void fixup_discard_support(struct
|
|
}
|
|
}
|
|
|
|
+/**
|
|
+ * blk_queue_max_hw_sectors - set max sectors for a request for this queue
|
|
+ * @q: the request queue for the device
|
|
+ * @max_hw_sectors: max hardware sectors in the usual 512b unit
|
|
+ *
|
|
+ * Description:
|
|
+ * Enables a low level driver to set a hard upper limit,
|
|
+ * max_hw_sectors, on the size of requests. max_hw_sectors is set by
|
|
+ * the device driver based upon the capabilities of the I/O
|
|
+ * controller.
|
|
+ *
|
|
+ * max_dev_sectors is a hard limit imposed by the storage device for
|
|
+ * READ/WRITE requests. It is set by the disk driver.
|
|
+ *
|
|
+ * max_sectors is a soft limit imposed by the block layer for
|
|
+ * filesystem type requests. This value can be overridden on a
|
|
+ * per-device basis in /sys/block/<device>/queue/max_sectors_kb.
|
|
+ * The soft limit can not exceed max_hw_sectors.
|
|
+ **/
|
|
+static void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_sectors)
|
|
+{
|
|
+ struct queue_limits *limits = &q->limits;
|
|
+ unsigned int max_sectors;
|
|
+
|
|
+ if ((max_hw_sectors << 9) < PAGE_SIZE) {
|
|
+ max_hw_sectors = 1 << (PAGE_SHIFT - 9);
|
|
+ pr_info("%s: set to minimum %u\n", __func__, max_hw_sectors);
|
|
+ }
|
|
+
|
|
+ max_hw_sectors = round_down(max_hw_sectors,
|
|
+ limits->logical_block_size >> SECTOR_SHIFT);
|
|
+ limits->max_hw_sectors = max_hw_sectors;
|
|
+
|
|
+ max_sectors = min_not_zero(max_hw_sectors, limits->max_dev_sectors);
|
|
+
|
|
+ if (limits->max_user_sectors)
|
|
+ max_sectors = min(max_sectors, limits->max_user_sectors);
|
|
+ else
|
|
+ max_sectors = min(max_sectors, BLK_DEF_MAX_SECTORS_CAP);
|
|
+
|
|
+ max_sectors = round_down(max_sectors,
|
|
+ limits->logical_block_size >> SECTOR_SHIFT);
|
|
+ limits->max_sectors = max_sectors;
|
|
+
|
|
+ if (!q->disk)
|
|
+ return;
|
|
+ q->disk->bdi->io_pages = max_sectors >> (PAGE_SHIFT - 9);
|
|
+}
|
|
+
|
|
void drbd_reconsider_queue_parameters(struct drbd_device *device, struct drbd_backing_dev *bdev)
|
|
{
|
|
struct request_queue * const q = device->rq_queue;
|