From: Dan Williams <dan.j.williams@intel.com>
Date: Thu, 18 Nov 2010 09:22:01 +0000 (+0100)
Subject: Assemble: fix assembly in the delta_disks > max_degraded case
X-Git-Tag: mdadm-3.2~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcc4210f58ac500701d50a5fc32869eeae3df4ea;p=thirdparty%2Fmdadm.git

Assemble: fix assembly in the delta_disks > max_degraded case

Incremental assembly works on such an array because the kernel sees the
disk as in-sync and that the array is reshaping.  Teach Assemble() the
same assumptions.

This is only needed on kernels that do not initialize ->recovery_offset
when activating spares for reshape.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Assemble.c b/Assemble.c
index 607f2afc..a152d656 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -868,7 +868,9 @@ int Assemble(struct supertype *st, char *mddev,
 		    devices[most_recent].i.events) {
 			devices[j].uptodate = 1;
 			if (i < content->array.raid_disks) {
-				if (devices[j].i.recovery_start == MaxSector) {
+				if (devices[j].i.recovery_start == MaxSector ||
+				    (content->reshape_active &&
+				     j >= content->array.raid_disks - content->delta_disks)) {
 					okcnt++;
 					avail[i]=1;
 				} else