ef9089f4e8
Update to the head of the upstream staging branch
* Patches 0005-0042 are from the upstream staging branch
* Previous patches 0005 & 0006 are now patches 0023 & 0005
Rename redhat patches
* Previous patches 0007-0017 are now patches 0043-0053
Change from using readline to libedit
* readline is licensed GPL v3, and multipathd includes code
licensed gpl v2.
Remove README.alua
* information moved to README.md
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Tue, 12 Jul 2022 17:02:51 -0500
|
|
Subject: [PATCH] libmultipath: fix find_multipaths_timeout for unknown
|
|
hardware
|
|
|
|
pp->hwe is now a vector that will always be allocated for all path
|
|
devices. Instead of checking if it is NULL, check if it is empty.
|
|
|
|
Fixes: f0462f0 ("libmultipath: use vector for for pp->hwe and mp->hwe")
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
libmultipath/propsel.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libmultipath/propsel.c b/libmultipath/propsel.c
|
|
index 50d0b5c8..f782f251 100644
|
|
--- a/libmultipath/propsel.c
|
|
+++ b/libmultipath/propsel.c
|
|
@@ -1293,7 +1293,7 @@ out:
|
|
*/
|
|
if (pp->find_multipaths_timeout < 0) {
|
|
pp->find_multipaths_timeout = -pp->find_multipaths_timeout;
|
|
- if (!pp->hwe) {
|
|
+ if (VECTOR_SIZE(pp->hwe) == 0) {
|
|
pp->find_multipaths_timeout =
|
|
DEFAULT_UNKNOWN_FIND_MULTIPATHS_TIMEOUT;
|
|
origin = "(default for unknown hardware)";
|