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

* disk/raid.c (insert_array): Select unique numbers for named arrays

Browse source 
as well, for use as keys in the disk cache.
This commit is contained in:
Colin Watson 2010-08-02 09:51:23 -05:00
parent c7db243b92
commit a870a783be
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-08-02 Colin Watson <cjwatson@ubuntu.com>
* disk/raid.c (insert_array): Select unique numbers for named arrays
as well, for use as keys in the disk cache.
2010-08-01 Robert Millan <rmh@gnu.org> 2010-08-01 Robert Millan <rmh@gnu.org>
* util/grub.d/10_kfreebsd.in: Initialize ${kfreebsd_device} as the * util/grub.d/10_kfreebsd.in: Initialize ${kfreebsd_device} as the

29
disk/raid.c
View file

@ -528,25 +528,28 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
grub_memset (&array->device, 0, sizeof (array->device)); grub_memset (&array->device, 0, sizeof (array->device));
grub_memset (&array->start_sector, 0, sizeof (array->start_sector)); grub_memset (&array->start_sector, 0, sizeof (array->start_sector));
if (array->name) if (! array->name)
goto skip_duplicate_check; {
/* 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->name && p->number == array->number)
if (! p->name && p->number == array->number) break;
break; }
} }
if (p) if (array->name || p)
{ {
/* The number is already in use, so we need to find a new one. */ /* The number is already in use, so we need to find a new one.
int i = 0; (Or, in the case of named arrays, the array doesn't have its
own number, but we need one that doesn't clash for use as a key
in the disk cache. */
int i = array->name ? 0x40000000 : 0;
while (1) while (1)
{ {
for (p = array_list; p != NULL; p = p->next) for (p = array_list; p != NULL; p = p->next)
{ {
if (! p->name && p->number == i) if (p->number == i)
break; break;
} }
@ -560,7 +563,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
i++; i++;
} }
} }
skip_duplicate_check:
/* mdraid 1.x superblocks have only a name stored not a number. /* mdraid 1.x superblocks have only a name stored not a number.
Use it directly as GRUB device. */ Use it directly as GRUB device. */
if (! array->name) if (! array->name)