Unless I missed something, it seems that grub_raid_array contains redundant
information (`name' is already present via `disk->name'). I propose to
simplify it this way.
--
Robert Millan
<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)
diff -x configure -x config.h.in -x CVS -x '*~' -x '*.mk' -urp ../grub2/disk/raid.c ./disk/raid.c
--- ../grub2/disk/raid.c 2007-12-30 09:52:03.000000000 +0100
+++ ./disk/raid.c 2008-02-06 17:35:24.000000000 +0100
@@ -146,7 +146,7 @@ grub_raid_read (grub_disk_t disk, grub_d
{
grub_uint32_t i;
- err = grub_disk_read (array->device[disknr].disk, read_sector, 0,
+ err = grub_disk_read (array->device[disknr], read_sector, 0,
read_size << GRUB_DISK_SECTOR_BITS, buf);
if (err)
break;
@@ -189,9 +189,9 @@ grub_raid_read (grub_disk_t disk, grub_d
for (i = 0; i < array->total_devs; i++)
{
- if (array->device[i].disk)
+ if (array->device[i])
{
- err = grub_disk_read (array->device[i].disk, sector, 0,
+ err = grub_disk_read (array->device[i], sector, 0,
size << GRUB_DISK_SECTOR_BITS, buf);
if (!err)
@@ -234,8 +234,8 @@ grub_raid_read (grub_disk_t disk, grub_d
{
grub_uint32_t i;
- if (array->device[disknr].disk)
- err = grub_disk_read (array->device[disknr].disk, read_sector, 0,
+ if (array->device[disknr])
+ err = grub_disk_read (array->device[disknr], read_sector, 0,
read_size << GRUB_DISK_SECTOR_BITS, buf);
/* If an error occurs when we already have an degraded
@@ -243,7 +243,7 @@ grub_raid_read (grub_disk_t disk, grub_d
if (err && ((array->total_devs - 1) == array->nr_devs))
break;
- if (err || ! array->device[disknr].disk)
+ if (err || ! array->device[disknr])
{
/* Either an error occured or the disk is not
available. We have to compute this block from the
@@ -260,7 +260,7 @@ grub_raid_read (grub_disk_t disk, grub_d
if (j != (unsigned int) disknr)
{
- err = grub_disk_read (array->device[j].disk, read_sector,
+ err = grub_disk_read (array->device[j], read_sector,
0, buf_size, buf2);
if (err)
return err;
@@ -410,7 +410,7 @@ grub_raid_scan_device (const char *name)
return 0;
}
- if (array->device[sb.this_disk.number].name != 0)
+ if (array->device[sb.this_disk.number]->name != 0)
{
/* We found multiple devices with the same number. Again,
this shouldn't happen.*/
@@ -491,14 +491,10 @@ grub_raid_scan_device (const char *name)
}
/* Add the device to the array. */
- array->device[sb.this_disk.number].name = grub_strdup (name);
- array->device[sb.this_disk.number].disk = grub_disk_open (name);
+ array->device[sb.this_disk.number] = grub_disk_open (name);
- if (! array->device[sb.this_disk.number].name
- || ! array->device[sb.this_disk.number].disk)
+ if (! array->device[sb.this_disk.number])
{
- grub_free (array->device[sb.this_disk.number].name);
-
/* Remove array from the list if we have just added it. */
if (array->nr_devs == 0)
{
diff -x configure -x config.h.in -x CVS -x '*~' -x '*.mk' -urp ../grub2/include/grub/raid.h ./include/grub/raid.h
--- ../grub2/include/grub/raid.h 2007-07-22 01:32:22.000000000 +0200
+++ ./include/grub/raid.h 2008-02-06 17:34:37.000000000 +0100
@@ -37,11 +37,7 @@ struct grub_raid_array
char *name; /* That will be "md<number>". */
grub_uint64_t disk_size; /* Size of an individual disk, in 512 byte
sectors. */
- struct
- {
- char *name; /* Name of the device */
- grub_disk_t disk; /* The device itself. */
- } device[32]; /* Array of total_devs devices. */
+ grub_disk_t device[32]; /* Array of total_devs devices. */
struct grub_raid_array *next;
};
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/grub-devel
