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

Simplify disk opening

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-07-07 21:46:25 +02:00
parent 00542307eb
commit 0044d1db2e
15 changed files with 29 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

28
grub-core/kern/disk.c
View file

@ -206,13 +206,9 @@ grub_disk_dev_iterate (int (*hook) (const char *name))
grub_disk_pull_t pull;
for (pull = 0; pull < GRUB_DISK_PULL_MAX; pull++)
{
if (pull == GRUB_DISK_PULL_RESCAN_UNTYPED)
continue;
for (p = grub_disk_dev_list; p; p = p->next)
if (p->iterate && (p->iterate) (hook, pull))
return 1;
}
for (p = grub_disk_dev_list; p; p = p->next)
if (p->iterate && (p->iterate) (hook, pull))
return 1;
return 0;
}
@ -243,7 +239,6 @@ grub_disk_open (const char *name)
grub_disk_dev_t dev;
char *raw = (char *) name;
grub_uint64_t current_time;
grub_disk_pull_t pull;
grub_dprintf ("disk", "Opening `%s'...\n", name);
@ -270,19 +265,14 @@ grub_disk_open (const char *name)
if (! disk->name)
goto fail;
for (pull = 0; pull < GRUB_DISK_PULL_MAX; pull++)
for (dev = grub_disk_dev_list; dev; dev = dev->next)
{
for (dev = grub_disk_dev_list; dev; dev = dev->next)
{
if ((dev->open) (raw, disk, pull) == GRUB_ERR_NONE)
break;
else if (grub_errno == GRUB_ERR_UNKNOWN_DEVICE)
grub_errno = GRUB_ERR_NONE;
else
goto fail;
}
if (dev)
if ((dev->open) (raw, disk) == GRUB_ERR_NONE)
break;
else if (grub_errno == GRUB_ERR_UNKNOWN_DEVICE)
grub_errno = GRUB_ERR_NONE;
else
goto fail;
}
if (! dev)