diff --git a/0063-libmultipath-orphan_paths-avoid-BUG-message.patch b/0063-libmultipath-orphan_paths-avoid-BUG-message.patch new file mode 100644 index 0000000000000000000000000000000000000000..163ee79f209060784f63d1fe0b98b9998868abad --- /dev/null +++ b/0063-libmultipath-orphan_paths-avoid-BUG-message.patch @@ -0,0 +1,32 @@ +From da135ec52df4fee7fe261a4a2b2118468264555c Mon Sep 17 00:00:00 2001 +From: Martin Wilck +Date: Tue, 11 Aug 2020 21:08:27 +0200 +Subject: [PATCH] libmultipath: orphan_paths(): avoid BUG message + +Since c44d769, we print a BUG message when we orphan a path that +holds the mpp->hwe pointer. But if this called via orphan_paths(), +this is expected and we shouldn't warn. + +Fixes: c44d769 ("libmultipath: warn if freeing path that holds mpp->hwe") + +Reviewed-by: Benjamin Marzinski +--- + libmultipath/structs_vec.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libmultipath/structs_vec.c b/libmultipath/structs_vec.c +index 7eaa870..35368c2 100644 +--- a/libmultipath/structs_vec.c ++++ b/libmultipath/structs_vec.c +@@ -116,6 +116,8 @@ void orphan_paths(vector pathvec, struct multipath *mpp, const char *reason) + int i; + struct path * pp; + ++ /* Avoid BUG message from orphan_path() */ ++ mpp->hwe = NULL; + vector_foreach_slot (pathvec, pp, i) { + if (pp->mpp == mpp) { + orphan_path(pp, reason); +-- +2.43.0 + diff --git a/multipath-tools.spec b/multipath-tools.spec index eb5a95b71707bf0a449da37777d3cf87ff67ece7..27f25be1f8e2962441ccc9fc4c7840829fdfd88e 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -2,7 +2,7 @@ Name: multipath-tools Version: 0.8.4 -Release: 38 +Release: 39 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/ @@ -72,6 +72,7 @@ Patch59: 0059-11-dm-mpath.rules-fix-warnings-reported-by-udevadm-v.patch Patch60: 0060-dm-parts.rules-fix-warning-reported-by-udevadm-verif.patch Patch61: 0061-libmultipath-fix-checker-detection-for-nvme-devices.patch Patch62: 0062-libmpathpersist-set-mpp-mpe-before-selecting-reserva.patch +Patch63: 0063-libmultipath-orphan_paths-avoid-BUG-message.patch BuildRequires: multipath-tools, libcmocka, libcmocka-devel BuildRequires: gcc, libaio-devel, userspace-rcu-devel, device-mapper-devel >= 1.02.89 @@ -220,6 +221,9 @@ fi %changelog +* Fri Nov 7 2025 xueyamao - 0.8.4-39 +- libmultipath: orphan_paths(): avoid BUG message + * Thu Oct 30 2025 xueyamao - 0.8.4-38 - libmpathpersist: set mpp->mpe before selecting reservation_key