[13/33] libmultipath: use existing alias from bindings file

Commit Message

Martin Wilck Feb. 28, 2017, 4:23 p.m. UTC

From: Hannes Reinecke <[e-mail]>

If the bindings file has been edited by hand not all entries conform
to the user_friendly_prefix setting. So if we don't find a matching
alias we need to check if the wwid is set to a different alias; if
so we need to use that.
Otherwise we'll end up with duplicate entries in the bindings file.


Signed-off-by: Hannes Reinecke <[e-mail]>
---
 libmultipath/alias.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Patch

diff --git a/libmultipath/alias.c b/libmultipath/alias.c
index 12afef8f..fd6b7f91 100644
--- a/libmultipath/alias.c
+++ b/libmultipath/alias.c
@@ -107,6 +107,7 @@  lookup_binding(FILE *f, char *map_wwid, char **map_alias, char *prefix)
 
 	*map_alias = NULL;
 
+	rewind(f);
 	while (fgets(buf, LINE_MAX, f)) {
 		char *c, *alias, *wwid;
 		int curr_id;
@@ -280,6 +281,13 @@  use_existing_alias (char *wwid, char *file, char *alias_old,
 		goto out;
 	}
 
+	id = lookup_binding(f, wwid, &alias, NULL);
+	if (alias) {
+		condlog(3, "Use existing binding [%s] for WWID [%s]",
+			alias, wwid);
+		goto out;
+	}
+
 	/* allocate the existing alias in the bindings file */
 	id = scan_devname(alias_old, prefix);
 	if (id <= 0)