vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* disk/raid.c (insert_array): Don't count named arrays when looking

Browse source 
for unused array numbers.
Reported and tested by: maru.
This commit is contained in:
Colin Watson 2010-07-22 09:38:06 +01:00
parent c03507dfb8
commit a9600892c1
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2010-07-22 Colin Watson <cjwatson@ubuntu.com>
* disk/raid.c (insert_array): Don't count named arrays when looking
for unused array numbers.
Reported and tested by: maru.
2010-07-20 Colin Watson <cjwatson@ubuntu.com> 2010-07-20 Colin Watson <cjwatson@ubuntu.com>
* bus/usb/emu/usb.c (grub_usb_poll_devices): Add a dummy * bus/usb/emu/usb.c (grub_usb_poll_devices): Add a dummy

4
disk/raid.c
View file

@ -533,7 +533,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
/* Check whether we don't have multiple arrays with the same number. */ /* Check whether we don't have multiple arrays with the same number. */
for (p = array_list; p != NULL; p = p->next) for (p = array_list; p != NULL; p = p->next)
{ {
if (p->number == array->number) if (! p->name && p->number == array->number)
break; break;
} }
@ -546,7 +546,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
{ {
for (p = array_list; p != NULL; p = p->next) for (p = array_list; p != NULL; p = p->next)
{ {
if (p->number == i) if (! p->name && p->number == i)
break; break;
} }