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

Rename grub_disk members

Browse source 
Otherwise it horribly clashes with gnulib when it's
replacing open/write/read/close

Signed-off-by: Vladimir Serbinenko <phcoder@google.com>
This commit is contained in:
Vladimir Serbinenko 2019-03-22 17:07:00 +01:00 • committed by Vincent Batts
parent 4745ee216c
commit f762850a1c
23 changed files with 135 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

12
util/grub-install.c
View file

@ -446,8 +446,8 @@ probe_mods (grub_disk_t disk)
if (raid_level >= 0)
{
grub_install_push_module ("diskfilter");
if (disk->dev->raidname)
grub_install_push_module (disk->dev->raidname (disk));
if (disk->dev->disk_raidname)
grub_install_push_module (disk->dev->disk_raidname (disk));
}
if (raid_level == 5)
grub_install_push_module ("raid5rec");
@ -455,8 +455,8 @@ probe_mods (grub_disk_t disk)
grub_install_push_module ("raid6rec");
/* In case of LVM/RAID, check the member devices as well. */
if (disk->dev->memberlist)
list = disk->dev->memberlist (disk);
if (disk->dev->disk_memberlist)
list = disk->dev->disk_memberlist (disk);
while (list)
{
probe_mods (list->disk);
@ -514,9 +514,9 @@ probe_cryptodisk_uuid (grub_disk_t disk)
grub_disk_memberlist_t list = NULL, tmp;
/* In case of LVM/RAID, check the member devices as well. */
if (disk->dev->memberlist)
if (disk->dev->disk_memberlist)
{
list = disk->dev->memberlist (disk);
list = disk->dev->disk_memberlist (disk);
}
while (list)
{