From: mwilck@arcor.de <mwilck@arcor.de>
Date: Tue, 23 Apr 2013 18:10:16 +0000 (+0200)
Subject: DDF: fix bug in compare_super_ddf
X-Git-Tag: mdadm-3.3-rc1~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f188b10816ca315274b0c79904cd5aa87d800ae;p=thirdparty%2Fmdadm.git

DDF: fix bug in compare_super_ddf

Fix bug in previous patch
"DDF: compare_super_ddf: merge local info of other superblock"

Just discovered this bug in my last patch set - unfortunately, just after
you committed it.

Signed-off-by: Martin Wilck <mwilck@arcor.de>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/super-ddf.c b/super-ddf.c
index 455f0f8d..ea8439b0 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -3514,7 +3514,7 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
 
 		vl1->next = first->conflist;
 		vl1->block_sizes = NULL;
-		if (vl1->conf.sec_elmnt_count > 1) {
+		if (vl2->conf.sec_elmnt_count > 1) {
 			vl1->other_bvds = xcalloc(vl2->conf.sec_elmnt_count - 1,
 						  sizeof(struct vd_config *));
 		} else