From: NeilBrown <neilb@suse.de>
Date: Tue, 6 May 2014 01:42:12 +0000 (+1000)
Subject: DDF: allow for unused slots when creating map list for getinfo_super_ddf.
X-Git-Tag: mdadm-3.3.1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=708997ffb7f0007ca9d42fc68289b34c2edbe8e2;p=thirdparty%2Fmdadm.git

DDF: allow for unused slots when creating map list for getinfo_super_ddf.

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

diff --git a/super-ddf.c b/super-ddf.c
index 5a07c46e..475eadc4 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -2042,10 +2042,14 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info, char *m
 	uuid_from_super_ddf(st, info->uuid);
 
 	if (map) {
-		int i;
-		for (i = 0 ; i < map_disks; i++) {
-			if (i < info->array.raid_disks &&
-			    !(be16_to_cpu(ddf->phys->entries[i].state)
+		int i, e = 0;
+		int max = be16_to_cpu(ddf->phys->max_pdes);
+		for (i = e = 0 ; i < map_disks ; i++, e++) {
+			while (e < max &&
+			       be32_to_cpu(ddf->phys->entries[e].refnum) == 0xffffffff)
+				e++;
+			if (i < info->array.raid_disks && e < max &&
+			    !(be16_to_cpu(ddf->phys->entries[e].state)
 			      & DDF_Failed))
 				map[i] = 1;
 			else