c64a48b95f
Pull in latest upstream post-tag commits
* Patches 0001-0015 are from
https://github.com/openSUSE/multipath-tools/tree/queue and are
already queued for upstream
Rename files
* Previous patches 0001-0010 and now patches 0016-0025
28 lines
927 B
Diff
28 lines
927 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Mon, 17 May 2021 11:29:55 -0500
|
|
Subject: [PATCH] multipathd: remove duplicate orphan_paths in flush_map
|
|
|
|
remove_map_and_stop_waiter() already calls orphan_paths() so flush_map()
|
|
doesn't need to call orphan_paths() before calling
|
|
remove_map_and_stop_waiter().
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
multipathd/main.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index 2062bc10..266d6b44 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -660,7 +660,6 @@ flush_map(struct multipath * mpp, struct vectors * vecs, int nopaths)
|
|
else
|
|
condlog(2, "%s: map flushed", mpp->alias);
|
|
|
|
- orphan_paths(vecs->pathvec, mpp, "map flushed");
|
|
remove_map_and_stop_waiter(mpp, vecs);
|
|
|
|
return 0;
|