Merge branch 'master' into devel-3.0
This commit is contained in:
commit
5a52a34090
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue