reload_and_sync_map() needs to always resync the map after calling
reload_map(), because the mpp state may no longer match the kernel
state if reload_map() fails.
Reviewed-by: Martin Wilck <mwilck@xxxxxxxx>
Signed-off-by: Benjamin Marzinski <bmarzins@xxxxxxxxxx>
---
multipathd/main.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/multipathd/main.c b/multipathd/main.c
index 6d1a5382..0d2a6780 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -2188,13 +2188,15 @@ static int reload_map(struct vectors *vecs, struct multipath *mpp,
int reload_and_sync_map(struct multipath *mpp, struct vectors *vecs)
{
+ int ret = 0;
+
if (reload_map(vecs, mpp, 1))
- return 1;
+ ret = 1;
if (setup_multipath(vecs, mpp) != 0)
return 2;
sync_map_state(mpp);
- return 0;
+ return ret;
}
static int check_path_reinstate_state(struct path * pp) {
--
2.45.0
