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

2008-02-09 Robert Millan <rmh@aybabtu.com>

Browse source 
* disk/raid.c (grub_raid_scan_device): Add a pair of sanity checks for
        situations in which we can deduce the RAID size and the superblock
        doesn't match it.
This commit is contained in:
robertmh 2008-02-09 10:54:44 +00:00
parent b92f0c1843
commit 7a634e08cb
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-02-09 Robert Millan <rmh@aybabtu.com>
* disk/raid.c (grub_raid_scan_device): Add a pair of sanity checks for
situations in which we can deduce the RAID size and the superblock
doesn't match it.
2008-02-09 Robert Millan <rmh@aybabtu.com>
* disk/lvm.c [GRUB_UTIL] (grub_lvm_memberlist): New function. Construct

21
disk/raid.c
View file

@ -523,6 +523,27 @@ grub_raid_scan_device (const char *name)
/* Add the device to the array. */
array->device[sb.this_disk.number] = grub_disk_open (name);
if (array->disk_size != array->device[sb.this_disk.number]->total_sectors)
{
if (array->total_devs == 1)
{
grub_dprintf ("raid", "Array contains only one disk, but its size (0x%llx) "
"doesn't match with size indicated by superblock (0x%llx). "
"Assuming superblock is wrong.\n",
array->device[sb.this_disk.number]->total_sectors, array->disk_size);
array->disk_size = array->device[sb.this_disk.number]->total_sectors;
}
else if (array->level == 1)
{
grub_dprintf ("raid", "Array is RAID level 1, but the size of disk %d (0x%llx) "
"doesn't match with size indicated by superblock (0x%llx). "
"Assuming superblock is wrong.\n",
sb.this_disk.number,
array->device[sb.this_disk.number]->total_sectors, array->disk_size);
array->disk_size = array->device[sb.this_disk.number]->total_sectors;
}
}
if (! array->device[sb.this_disk.number])
{