Merge branch 'master' into devel-3.0

This commit is contained in:
NeilBrown 2008-11-27 15:48:45 +11:00
commit 5a52a34090
1 changed files with 0 additions and 2 deletions

View File

@ -770,7 +770,6 @@ int Assemble(struct supertype *st, char *mddev,
int j = best[i];
if (j>=0 &&
!devices[j].uptodate &&
devices[j].i.events > 0 &&
(chosen_drive < 0 ||
devices[j].i.events
> devices[chosen_drive].i.events))
@ -828,7 +827,6 @@ int Assemble(struct supertype *st, char *mddev,
int j = best[i];
if (j >= 0 &&
!devices[j].uptodate &&
devices[j].i.events > 0 &&
devices[j].i.events == current_events) {
chosen_drive = j;
goto add_another;