From: NeilBrown <neilb@suse.de>
Date: Tue, 7 Apr 2015 23:29:31 +0000 (+1000)
Subject: Revert "Assemble: support assembling of a RAID0 being reshaped."
X-Git-Tag: mdadm-3.3.3~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d316dba7c9d337c7122a7ff5228f1a7f598b8d7d;p=thirdparty%2Fmdadm.git

Revert "Assemble: support assembling of a RAID0 being reshaped."

This reverts commit b720636a5849397dbc6dc1b0f0b671d17034a28b.

As it said, this was a hack.  It causes problems when trying to
--force assemble a RAID4.  There is a better way.

Reported-by: "Jonathan Harker (Jesusaurus)" <jesusaurus@gentlydownthe.net>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Assemble.c b/Assemble.c
index 08d9d1b9..3708b55a 100644
--- a/Assemble.c
+++ b/Assemble.c
@@ -1526,9 +1526,7 @@ try_again:
 			if (i < content->array.raid_disks * 2) {
 				if (devices[j].i.recovery_start == MaxSector ||
 				    (content->reshape_active &&
-				     ((i >= content->array.raid_disks - content->delta_disks) ||
-				      (i >= content->array.raid_disks - content->delta_disks - 1
-				       && content->array.level == 4)))) {
+				     i >= content->array.raid_disks - content->delta_disks)) {
 					if (!avail[i/2]) {
 						okcnt++;
 						avail[i/2]=1;