From a792ece6768143ea557c63e35437536b9d235bb4 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 2 Sep 2013 11:48:06 +1000 Subject: [PATCH] Assemble: don't ever consider a 'spare' to be the 'most recent'. If all devices have the same event count and the first one is a spare, then that spare will be the 'most_recent'. However then other devices will think the 'most_recent' has failed (for v0.90 metadata) and will be rejected from the array. So never consider a 'spare' to be 'most recent'. Reported-by: Andreas Baer Signed-off-by: NeilBrown --- Assemble.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Assemble.c b/Assemble.c index 32e05b0..60a52b2 100644 --- a/Assemble.c +++ b/Assemble.c @@ -564,7 +564,7 @@ static int load_devices(struct devs *devices, char *devmap, #ifndef MDASSEMBLE int bitmap_done = 0; #endif - int most_recent = 0; + int most_recent = -1; int bestcnt = 0; int *best = *bestp; @@ -695,10 +695,12 @@ static int load_devices(struct devs *devices, char *devmap, devices[devcnt].i.disk.major = major(stb.st_rdev); devices[devcnt].i.disk.minor = minor(stb.st_rdev); - if (devices[devcnt].i.events - > devices[most_recent].i.events && - devices[devcnt].i.disk.state == 6) + if (devices[devcnt].i.disk.state == 6) { + if (most_recent < 0 || + devices[devcnt].i.events + > devices[most_recent].i.events) most_recent = devcnt; + } if (content->array.level == LEVEL_MULTIPATH) /* with multipath, the raid_disk from the superblock is meaningless */ @@ -766,7 +768,8 @@ static int load_devices(struct devs *devices, char *devmap, } devcnt++; } - *most_recentp = most_recent; + if (most_recent >= 0) + *most_recentp = most_recent; *bestcntp = bestcnt; *bestp = best; return devcnt;