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

2009-07-31 Bean <bean123ch@gmail.com>

Browse source 
* disk/lvm.c (grub_lvm_scan_device): Ignore extra copy of metadata.
	Don't change pv->disk if it's already set.

	* disk/raid.c (grub_raid_scan_device): Merge this function into ...
	(grub_raid_register): ... here.
	(grub_raid_rescan): Removed.

	* include/grub/raid.h (grub_raid_rescan): Removed.

	* util/grub-fstest.c: Remove include file <grub/raid.h>.
	(fstest): Replace grub_raid_rescan with module fini function followed
	by init function.

	* util/grub-probe.c: Add include file <grub/raid.h>.
	(probe_raid_level): New function.
	(probe): Detect abstraction by walking the disk device, support two
	level of abstraction (LVM on RAID) when detecting partition map.
This commit is contained in:
bean 2009-07-31 14:25:19 +00:00
parent 24443b5a47
commit f45d6cfc48
6 changed files with 139 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

15
disk/lvm.c
View file

@ -271,15 +271,9 @@ grub_lvm_scan_device (const char *name)
dlocn++;
mda_offset = grub_le_to_cpu64 (dlocn->offset);
mda_size = grub_le_to_cpu64 (dlocn->size);
dlocn++;
if (dlocn->offset)
{
grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
"We don't support multiple LVM metadata areas");
goto fail;
}
/* It's possible to have multiple copies of metadata areas, we just use the
first one. */
/* Allocate buffer space for the circular worst-case scenario. */
metadatabuf = grub_malloc (2 * mda_size);
@ -564,7 +558,10 @@ grub_lvm_scan_device (const char *name)
{
if (! grub_memcmp (pv->id, pv_id, GRUB_LVM_ID_STRLEN))
{
pv->disk = grub_disk_open (name);
/* This could happen to LVM on RAID, pv->disk points to the
raid device, we shouldn't change it. */
if (! pv->disk)
pv->disk = grub_disk_open (name);
break;
}
}

88
disk/raid.c
View file

@ -589,56 +589,6 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
static grub_raid_t grub_raid_list;
static void
grub_raid_scan_device (int head_only)
{
auto int hook (const char *name);
int hook (const char *name)
{
grub_disk_t disk;
struct grub_raid_array array;
struct grub_raid *p;
grub_dprintf ("raid", "Scanning for RAID devices on disk %s\n", name);
disk = grub_disk_open (name);
if (!disk)
return 0;
if (disk->total_sectors == GRUB_ULONG_MAX)
{
grub_disk_close (disk);
return 0;
}
for (p = grub_raid_list; p; p = p->next)
{
if (! p->detect (disk, &array))
{
if (! insert_array (disk, &array, p->name))
return 0;
break;
}
/* This error usually means it's not raid, no need to display
it. */
if (grub_errno != GRUB_ERR_OUT_OF_RANGE)
grub_print_error ();
grub_errno = GRUB_ERR_NONE;
if (head_only)
break;
}
grub_disk_close (disk);
return 0;
}
grub_device_iterate (&hook);
}
static void
free_array (void)
{
@ -668,9 +618,38 @@ free_array (void)
void
grub_raid_register (grub_raid_t raid)
{
auto int hook (const char *name);
int hook (const char *name)
{
grub_disk_t disk;
struct grub_raid_array array;
grub_dprintf ("raid", "Scanning for RAID devices on disk %s\n", name);
disk = grub_disk_open (name);
if (!disk)
return 0;
if ((disk->total_sectors != GRUB_ULONG_MAX) &&
(! grub_raid_list->detect (disk, &array)) &&
(! insert_array (disk, &array, grub_raid_list->name)))
return 0;
/* This error usually means it's not raid, no need to display
it. */
if (grub_errno != GRUB_ERR_OUT_OF_RANGE)
grub_print_error ();
grub_errno = GRUB_ERR_NONE;
grub_disk_close (disk);
return 0;
}
raid->next = grub_raid_list;
grub_raid_list = raid;
grub_raid_scan_device (1);
grub_device_iterate (&hook);
}
void
@ -686,13 +665,6 @@ grub_raid_unregister (grub_raid_t raid)
}
}
void
grub_raid_rescan (void)
{
free_array ();
grub_raid_scan_device (0);
}
static struct grub_disk_dev grub_raid_dev =
{
.name = "raid",