Remove duplicated code: search_mdstat and conf_match

search_mdstat and conf_match are almost identical.

Put all the functionality in conf_match, and remove search_mdstat.

Reported-by: Jes.Sorensen@redhat.com
Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 2 insertions, 80 deletions

diff --git a/Incremental.c b/Incremental.c
index 98a3a746..b5d3e025 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -47,11 +47,6 @@ static int Incremental_container(struct supertype *st, char *devname,
 				 int verbose, int runstop, int autof,
 				 int freeze_reshape);
 
-static struct mddev_ident *search_mdstat(struct supertype *st,
-					   struct mdinfo *info,
-					   char *devname,
-					   int verbose, int *rvp);
-
 int Incremental(char *devname, int verbose, int runstop,
 		struct supertype *st, char *homehost, int require_homehost,
 		int autof, int freeze_reshape)
@@ -213,7 +208,7 @@ int Incremental(char *devname, int verbose, int runstop,
 	st->ss->getinfo_super(st, &info, NULL);
 
 	/* 3/ Check if there is a match in mdadm.conf */
-	match = search_mdstat(st, &info, devname, verbose, &rv);
+	match = conf_match(st, &info, devname, verbose, &rv);
 	if (!match && rv == 2)
 		goto out;
 
@@ -591,79 +586,6 @@ out_unlock:
 	goto out;
 }
 
-static struct mddev_ident *search_mdstat(struct supertype *st,
-					   struct mdinfo *info,
-					   char *devname,
-					   int verbose, int *rvp)
-{
-	struct mddev_ident *array_list, *match;
-	array_list = conf_get_ident(NULL);
-	match = NULL;
-	for (; array_list; array_list = array_list->next) {
-		if (array_list->uuid_set &&
-		    same_uuid(array_list->uuid, info->uuid, st->ss->swapuuid)
-		    == 0) {
-			if (verbose >= 2 && array_list->devname)
-				fprintf(stderr, Name
-					": UUID differs from %s.\n",
-					array_list->devname);
-			continue;
-		}
-		if (array_list->name[0] &&
-		    strcasecmp(array_list->name, info->name) != 0) {
-			if (verbose >= 2 && array_list->devname)
-				fprintf(stderr, Name
-					": Name differs from %s.\n",
-					array_list->devname);
-			continue;
-		}
-		if (array_list->devices &&
-		    !match_oneof(array_list->devices, devname)) {
-			if (verbose >= 2 && array_list->devname)
-				fprintf(stderr, Name
-					": Not a listed device for %s.\n",
-					array_list->devname);
-			continue;
-		}
-		if (array_list->super_minor != UnSet &&
-		    array_list->super_minor != info->array.md_minor) {
-			if (verbose >= 2 && array_list->devname)
-				fprintf(stderr, Name
-					": Different super-minor to %s.\n",
-					array_list->devname);
-			continue;
-		}
-		if (!array_list->uuid_set &&
-		    !array_list->name[0] &&
-		    !array_list->devices &&
-		    array_list->super_minor == UnSet) {
-			if (verbose >= 2 && array_list->devname)
-				fprintf(stderr, Name
-					": %s doesn't have any identifying information.\n",
-					array_list->devname);
-			continue;
-		}
-		/* FIXME, should I check raid_disks and level too?? */
-
-		if (match) {
-			if (verbose >= 0) {
-				if (match->devname && array_list->devname)
-					fprintf(stderr, Name
-						": we match both %s and %s - cannot decide which to use.\n",
-						match->devname, array_list->devname);
-				else
-					fprintf(stderr, Name
-						": multiple lines in mdadm.conf match\n");
-			}
-			*rvp = 2;
-			match = NULL;
-			break;
-		}
-		match = array_list;
-	}
-	return match;
-}
-
 static void find_reject(int mdfd, struct supertype *st, struct mdinfo *sra,
 			int number, __u64 events, int verbose,
 			char *array_name)
@@ -1460,7 +1382,7 @@ static int Incremental_container(struct supertype *st, char *devname,
 		return 0;
 	}
 
-	match = search_mdstat(st, &info, devname, verbose, &rv);
+	match = conf_match(st, &info, devname, verbose, &rv);
 	if (match == NULL && rv == 2)
 		return rv;