b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
29 lines
852 B
Diff
29 lines
852 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Mon, 1 Feb 2021 13:10:46 +0100
|
|
Subject: [PATCH] multipathd: ev_add_path: fail if add_map_with_path() fails
|
|
|
|
If start_waiter was set before and the "rescan" label was used,
|
|
we may try to set up an empty/invalid map.
|
|
Always fail if add_map_with_path() isn't successful.
|
|
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/main.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index 43d77688..425492a9 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -1028,7 +1028,7 @@ rescan:
|
|
*/
|
|
start_waiter = 1;
|
|
}
|
|
- if (!start_waiter)
|
|
+ else
|
|
goto fail; /* leave path added to pathvec */
|
|
}
|
|
|