From: NeilBrown <neilb@suse.de>
Date: Mon, 22 Nov 2010 09:58:06 +0000 (+1100)
Subject: Incr/spare: make sure failure to identify metadata if handled gracefully.
X-Git-Tag: mdadm-3.2~269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e57f80a9005ab354ce7602b3ce0c7d7a0d239cb;p=thirdparty%2Fmdadm.git

Incr/spare: make sure failure to identify metadata if handled gracefully.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Incremental.c b/Incremental.c
index 44e83ba3..de7fa6f0 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -820,6 +820,13 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
 			for(i=0; !st2 && superlist[i]; i++)
 				st2 = superlist[i]->match_metadata_desc(
 					sra->text_version);
+			if (!st2) {
+				if (verbose > 1)
+					fprintf(stderr, Name ": not adding %s to %s"
+						" as metadata not recognised.\n",
+						devname, mp->path);
+				goto next;
+			}
 		} else
 			st2 = st;
 		get_dev_size(dfd, NULL, &devsize);