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 08d9d1b9b89e04c3db5bb4b2047b46e7617d1014..3708b55af77e8160e7c47354d986da1b62ae4637 100644 (file)
--- 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;