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

* grub-core/disk/diskfilter.c (scan_devices): Iteratively

Browse source 
rescan diskfilter devices until nothing new is found.
This commit is contained in:
Andrey Borzenkov 2013-06-16 16:12:50 +04:00
parent 4aa237c8a4
commit aa62a5b7f1
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-06-16 Andrey Borzenkov <arvidjaar@gmail.com>
* grub-core/disk/diskfilter.c (scan_devices): Iteratively
rescan diskfilter devices until nothing new is found.
2013-06-16 Vladimir Serbinenko <phcoder@gmail.com>
Fix casts when compiling coreboot-specific code for 64-bit EFI.

29
grub-core/disk/diskfilter.c
View file

@ -188,6 +188,7 @@ scan_disk (const char *name, int accept_diskfilter)
if (!accept_diskfilter && is_valid_diskfilter_name (name))
return 0;
/* FIXME do we still need it? It is not called recursively anymore */
if (scan_depth > 100)
return 0;
@ -219,6 +220,8 @@ scan_devices (const char *arname)
grub_disk_pull_t pull;
struct grub_diskfilter_vg *vg;
struct grub_diskfilter_lv *lv = NULL;
int scan_depth;
int need_rescan;
for (pull = 0; pull < GRUB_DISK_PULL_MAX; pull++)
for (p = grub_disk_dev_list; p; p = p->next)
@ -231,16 +234,26 @@ scan_devices (const char *arname)
return;
}
for (vg = array_list; vg; vg = vg->next)
scan_depth = 0;
need_rescan = 1;
while (need_rescan && scan_depth++ < 100)
{
if (vg->lvs)
for (lv = vg->lvs; lv; lv = lv->next)
if (!lv->scanned && lv->fullname && lv->became_readable_at)
{
scan_disk (lv->fullname, 1);
lv->scanned = 1;
}
need_rescan = 0;
for (vg = array_list; vg; vg = vg->next)
{
if (vg->lvs)
for (lv = vg->lvs; lv; lv = lv->next)
if (!lv->scanned && lv->fullname && lv->became_readable_at)
{
scan_disk (lv->fullname, 1);
lv->scanned = 1;
need_rescan = 1;
}
}
}
if (need_rescan)
grub_error (GRUB_ERR_UNKNOWN_DEVICE, "DISKFILTER scan depth exceeded");
}
static int