Fix 'enough' function for RAID10.

The 'enough' function is written to work with 'near' arrays only
in that is implicitly assumes that the offset from one 'group' of
devices to the next is the same as the number of copies.
In reality it is the number of 'near' copies.

So change it to make this number explicit.

Reported-by: Jakub Husák <jakub@gooseman.cz>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2012-10-03 13:53:46 +10:00
parent 6a1cde4d06
commit b3ec716d00
1 changed files with 4 additions and 3 deletions

7
util.c
View File

@ -344,14 +344,15 @@ int enough(int level, int raid_disks, int layout, int clean, char *avail)
/* there must be one of the 'copies' form 'first' */
int n = copies;
int cnt = 0;
int this = first;
while (n--) {
if (avail[first])
if (avail[this])
cnt++;
first = (first+1) % raid_disks;
this = (this+1) % raid_disks;
}
if (cnt == 0)
return 0;
first = (first+(layout&255)) % raid_disks;
} while (first != 0);
return 1;