[dm-devel] [PATCH 20/57] multipathd: Do not update the paths vec when removing paths

[Hannes Reinecke]

When we remove a path it's totally pointless to add it to
the path list first; it'll be removed on the next step anyway.
And we should be cleaning up the comments while we're at it.

Signed-off-by: Hannes Reinecke <hare at suse.de>
---
 multipathd/main.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/multipathd/main.c b/multipathd/main.c
index 59f0c68..61b82f6 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -695,14 +695,8 @@ ev_remove_path (struct path *pp, struct vectors * vecs)
 	 */
 	if ((mpp = pp->mpp)) {
 		/*
-		 * transform the mp->pg vector of vectors of paths
-		 * into a mp->params string to feed the device-mapper
+		 * Remove path from paths list
 		 */
-		if (update_mpp_paths(mpp, vecs->pathvec)) {
-			condlog(0, "%s: failed to update paths",
-				mpp->alias);
-			goto fail;
-		}
 		if ((i = find_slot(mpp->paths, (void *)pp)) != -1)
 			vector_del_slot(mpp->paths, i);
 
@@ -735,6 +729,10 @@ ev_remove_path (struct path *pp, struct vectors * vecs)
 			 */
 		}
 
+		/*
+		 * transform the mp->pg vector of vectors of paths
+		 * into a mp->params string to feed the device-mapper
+		 */
 		if (setup_map(mpp, params, PARAMS_SIZE)) {
 			condlog(0, "%s: failed to setup map for"
 				" removal of path %s", mpp->alias, pp->dev);
@@ -1016,6 +1014,7 @@ uxlsnrloop (void * ap)
 
 	umask(077);
 	uxsock_listen(&uxsock_trigger, ap);
+	condlog(1, "terminate uxsock listener");
 
 	return NULL;
 }
-- 
2.6.6