diff --git a/0007-fix-lun-expansion-failure-when-there-is-offline-path.patch b/0007-fix-lun-expansion-failure-when-there-is-offline-path.patch deleted file mode 100644 index b5dcf99577c5a09eaf7564fd268a96599df00ae0..0000000000000000000000000000000000000000 --- a/0007-fix-lun-expansion-failure-when-there-is-offline-path.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 9fab4f0956292141a72f7144f1d4157d353c0299 Mon Sep 17 00:00:00 2001 -From: renmingshuai -Date: Thu, 28 Jan 2021 22:26:58 +0800 -Subject: [PATCH] fix lun expansion failure when there is offline path - ---- - libmultipath/configure.c | 10 ++++++++++ - libmultipath/structs_vec.c | 5 +++-- - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/libmultipath/configure.c b/libmultipath/configure.c -index 4956d32..ce5bd8b 100644 ---- a/libmultipath/configure.c -+++ b/libmultipath/configure.c -@@ -1151,6 +1151,13 @@ int coalesce_paths (struct vectors *vecs, vector mpvec, char *refwwid, - orphan_path(pp1, "nvme:tcp path not allowed with request queue_mode multipath device"); - continue; - } -+ -+ /* if path is offline */ -+ if (pp1->state == PATH_DOWN) { -+ orphan_path(pp1, "skip offline path"); -+ continue; -+ } -+ - /* if path is handled before */ - if (pp1->handled) { - condlog(3, "%s: skip handled path.", pp1->dev_t); -@@ -1182,6 +1189,9 @@ int coalesce_paths (struct vectors *vecs, vector mpvec, char *refwwid, - if (strcmp(pp1->wwid, pp2->wwid)) - continue; - -+ if (!pp2->size || pp2->state == PATH_DOWN) -+ continue; -+ - if (!mpp->size && pp2->size) - mpp->size = pp2->size; - -diff --git a/libmultipath/structs_vec.c b/libmultipath/structs_vec.c -index 61001aa..317d172 100644 ---- a/libmultipath/structs_vec.c -+++ b/libmultipath/structs_vec.c -@@ -742,8 +742,9 @@ int verify_paths(struct multipath *mpp) - /* - * see if path is in sysfs - */ -- if (!pp->udev || sysfs_attr_get_value(pp->udev, "dev", -- pp->dev_t, BLK_DEV_SIZE) < 0) { -+ if (!pp->udev || (sysfs_attr_get_value(pp->udev, "dev", -+ pp->dev_t, BLK_DEV_SIZE) < 0) || -+ (pp->state == PATH_DOWN && pp->size != mpp->size)) { - if (pp->state != PATH_DOWN) { - condlog(1, "%s: removing valid path %s in state %d", - mpp->alias, pp->dev, pp->state); --- -2.33.0 - diff --git a/multipath-tools.spec b/multipath-tools.spec index c7399ec3b3a94fbe19a42f3a663829d9a91ed604..5508046a127f774a7a1f4fe5d68c18a24e9db9a3 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ #needsrootforbuild Name: multipath-tools Version: 0.9.5 -Release: 15 +Release: 16 Summary: Tools to manage multipath devices with the device-mapper License: GPL-2.0-or-later and LGPL-2.0-only URL: http://christophe.varoqui.free.fr/ @@ -15,7 +15,6 @@ Patch3: 0003-RH-Remove-the-property-blacklist-exception-builtin.patch Patch4: 0004-fix-syntax-error.patch Patch5: 0005-fix-multipathd-resize-when-not-all-paths-size-are-eq.patch Patch6: 0006-avoid-handling-paths-repeatedly-in-coalesce-paths.patch -Patch7: 0007-fix-lun-expansion-failure-when-there-is-offline-path.patch Patch8: 0008-fix-bugs-backported-from-next-branch.patch Patch9: 0009-fix-change-reservation-key-to-uint8-for-memcmp.patch Patch10: 0010-bugfix-flush-and-sync-before-reboot.patch @@ -188,6 +187,9 @@ fi %changelog +* Tue Dec 16 2025 chenrenhui - 0.9.5-16 +- remove useless patch + * Fri Nov 14 2025 xueyamao - 0.9.5-15 - libmultipath: remove pathgroup wildcard options