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
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Wilck <mwilck@suse.com>
|
|
Date: Fri, 25 Sep 2020 21:37:16 +0200
|
|
Subject: [PATCH] libmpathpersist: initialize mpp->hwe in get_mpvec()
|
|
|
|
In __mpath_persistent_reserve_out, we call select_all_tg_pt(),
|
|
which requires mpp->hwe to be set. Initialize it in get_mpvec().
|
|
|
|
Fixes: 5b54e77 ("mpathpersist: add all_tg_pt option")
|
|
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmpathpersist/mpath_persist.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c
|
|
index 1f9817ed..4b3f3e0d 100644
|
|
--- a/libmpathpersist/mpath_persist.c
|
|
+++ b/libmpathpersist/mpath_persist.c
|
|
@@ -341,11 +341,13 @@ get_mpvec (vector curmp, vector pathvec, char * refwwid)
|
|
continue;
|
|
|
|
if (update_multipath_table(mpp, pathvec, DI_CHECKER) != DMP_OK ||
|
|
- update_multipath_status(mpp) != DMP_OK) {
|
|
+ update_multipath_status(mpp) != DMP_OK ||
|
|
+ update_mpp_paths(mpp, pathvec)) {
|
|
condlog(1, "error parsing map %s", mpp->wwid);
|
|
remove_map(mpp, pathvec, curmp, PURGE_VEC);
|
|
i--;
|
|
- }
|
|
+ } else
|
|
+ extract_hwe_from_path(mpp);
|
|
}
|
|
return MPATH_PR_SUCCESS ;
|
|
}
|