Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'md-3.6-fixes' of git://neil.brown.name/md
Pull two md bugfixes from NeilBrown:
"One (missing spinlock init) was only introduced recently. The other
has been present as long as raid10 has been supported, so is tagged
for -stable."
* tag 'md-3.6-fixes' of git://neil.brown.name/md:
md/raid10: fix "enough" function for detecting if array is failed.
md/raid5: add missing spin_lock_init.
+6
-3
+5
-3
drivers/md/raid10.c
+5
-3
drivers/md/raid10.c
···
1512
1512
do {
1513
1513
int n = conf->copies;
1514
1514
int cnt = 0;
1515
+
int this = first;
1515
1516
while (n--) {
1516
-
if (conf->mirrors[first].rdev &&
1517
-
first != ignore)
1517
+
if (conf->mirrors[this].rdev &&
1518
+
this != ignore)
1518
1519
cnt++;
1519
-
first = (first+1) % geo->raid_disks;
1520
+
this = (this+1) % geo->raid_disks;
1520
1521
}
1521
1522
if (cnt == 0)
1522
1523
return 0;
1524
+
first = (first + geo->near_copies) % geo->raid_disks;
1523
1525
} while (first != 0);
1524
1526
return 1;
1525
1527
}