From: Neil Brown <neilb@suse.de>
Date: Thu, 15 May 2008 05:50:48 +0000 (+1000)
Subject: Fix support for --update=swapsuper
X-Git-Tag: mdadm-2.6.5~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff1f6545dba0cc2e8c9561cf10de236579d6f58c;p=thirdparty%2Fmdadm.git

Fix support for --update=swapsuper

The user of dup_super broke it.
---

diff --git a/super0.c b/super0.c
index f2d6d63f..7e814829 100644
--- a/super0.c
+++ b/super0.c
@@ -856,7 +856,8 @@ static struct supertype *match_metadata_desc0(char *arg)
 		return st;
 
 	st->minor_version = 9; /* flag for 'byte-swapped' */
-	if (strcmp(arg, "0.swap")==0)
+	if (strcmp(arg, "0.swap")==0 ||
+	    strcmp(arg, "0.9") == 0) /* For dup_super support */
 		return st;
 
 	free(st);
diff --git a/util.c b/util.c
index 1ad6fd0d..6efb88aa 100644
--- a/util.c
+++ b/util.c
@@ -781,7 +781,8 @@ struct supertype *dup_super(struct supertype *st)
 	for (i = 0; stnew == NULL && superlist[i] ; i++)
 		stnew = superlist[i]->match_metadata_desc(verstr);
 
-	stnew->sb = NULL;
+	if (stnew)
+		stnew->sb = NULL;
 	return stnew;
 }