From d316dba7c9d337c7122a7ff5228f1a7f598b8d7d Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 8 Apr 2015 09:29:31 +1000 Subject: [PATCH] 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)" Signed-off-by: NeilBrown --- Assemble.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Assemble.c b/Assemble.c index 08d9d1b..3708b55 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;