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 Vladimir Serbinenko
parent 3562536fd5
commit 384091967d
23 changed files with 135 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
grub-core/disk/arc/arcdisk.c
View file

@ -296,11 +296,11 @@ static struct grub_disk_dev grub_arcdisk_dev =
{ {
.name = "arcdisk", .name = "arcdisk",
.id = GRUB_DISK_DEVICE_ARCDISK_ID, .id = GRUB_DISK_DEVICE_ARCDISK_ID,
.iterate = grub_arcdisk_iterate, .disk_iterate = grub_arcdisk_iterate,
.open = grub_arcdisk_open, .disk_open = grub_arcdisk_open,
.close = grub_arcdisk_close, .disk_close = grub_arcdisk_close,
.read = grub_arcdisk_read, .disk_read = grub_arcdisk_read,
.write = grub_arcdisk_write, .disk_write = grub_arcdisk_write,
.next = 0 .next = 0
}; };

10
grub-core/disk/ata.c
View file

@ -510,11 +510,11 @@ static struct grub_disk_dev grub_atadisk_dev =
{ {
.name = "ATA", .name = "ATA",
.id = GRUB_DISK_DEVICE_ATA_ID, .id = GRUB_DISK_DEVICE_ATA_ID,
.iterate = grub_ata_iterate, .disk_iterate = grub_ata_iterate,
.open = grub_ata_open, .disk_open = grub_ata_open,
.close = grub_ata_close, .disk_close = grub_ata_close,
.read = grub_ata_read, .disk_read = grub_ata_read,
.write = grub_ata_write, .disk_write = grub_ata_write,
.next = 0 .next = 0
}; };

12
grub-core/disk/cryptodisk.c
View file

@ -1015,13 +1015,13 @@ grub_cmd_cryptomount (grub_extcmd_context_t ctxt, int argc, char **args)
static struct grub_disk_dev grub_cryptodisk_dev = { static struct grub_disk_dev grub_cryptodisk_dev = {
.name = "cryptodisk", .name = "cryptodisk",
.id = GRUB_DISK_DEVICE_CRYPTODISK_ID, .id = GRUB_DISK_DEVICE_CRYPTODISK_ID,
.iterate = grub_cryptodisk_iterate, .disk_iterate = grub_cryptodisk_iterate,
.open = grub_cryptodisk_open, .disk_open = grub_cryptodisk_open,
.close = grub_cryptodisk_close, .disk_close = grub_cryptodisk_close,
.read = grub_cryptodisk_read, .disk_read = grub_cryptodisk_read,
.write = grub_cryptodisk_write, .disk_write = grub_cryptodisk_write,
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
.memberlist = grub_cryptodisk_memberlist, .disk_memberlist = grub_cryptodisk_memberlist,
#endif #endif
.next = 0 .next = 0
}; };

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

@ -228,9 +228,9 @@ scan_devices (const char *arname)
for (pull = 0; pull < GRUB_DISK_PULL_MAX; pull++) for (pull = 0; pull < GRUB_DISK_PULL_MAX; pull++)
for (p = grub_disk_dev_list; p; p = p->next) for (p = grub_disk_dev_list; p; p = p->next)
if (p->id != GRUB_DISK_DEVICE_DISKFILTER_ID if (p->id != GRUB_DISK_DEVICE_DISKFILTER_ID
&& p->iterate) && p->disk_iterate)
{ {
if ((p->iterate) (scan_disk_hook, NULL, pull)) if ((p->disk_iterate) (scan_disk_hook, NULL, pull))
return; return;
if (arname && is_lv_readable (find_lv (arname), 1)) if (arname && is_lv_readable (find_lv (arname), 1))
return; return;
@ -311,9 +311,9 @@ grub_diskfilter_memberlist (grub_disk_t disk)
for (pull = 0; pv && pull < GRUB_DISK_PULL_MAX; pull++) for (pull = 0; pv && pull < GRUB_DISK_PULL_MAX; pull++)
for (p = grub_disk_dev_list; pv && p; p = p->next) for (p = grub_disk_dev_list; pv && p; p = p->next)
if (p->id != GRUB_DISK_DEVICE_DISKFILTER_ID if (p->id != GRUB_DISK_DEVICE_DISKFILTER_ID
&& p->iterate) && p->disk_iterate)
{ {
(p->iterate) (scan_disk_hook, NULL, pull); (p->disk_iterate) (scan_disk_hook, NULL, pull);
while (pv && pv->disk) while (pv && pv->disk)
pv = pv->next; pv = pv->next;
} }
@ -1325,14 +1325,14 @@ static struct grub_disk_dev grub_diskfilter_dev =
{ {
.name = "diskfilter", .name = "diskfilter",
.id = GRUB_DISK_DEVICE_DISKFILTER_ID, .id = GRUB_DISK_DEVICE_DISKFILTER_ID,
.iterate = grub_diskfilter_iterate, .disk_iterate = grub_diskfilter_iterate,
.open = grub_diskfilter_open, .disk_open = grub_diskfilter_open,
.close = grub_diskfilter_close, .disk_close = grub_diskfilter_close,
.read = grub_diskfilter_read, .disk_read = grub_diskfilter_read,
.write = grub_diskfilter_write, .disk_write = grub_diskfilter_write,
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
.memberlist = grub_diskfilter_memberlist, .disk_memberlist = grub_diskfilter_memberlist,
.raidname = grub_diskfilter_getname, .disk_raidname = grub_diskfilter_getname,
#endif #endif
.next = 0 .next = 0
}; };

10
grub-core/disk/efi/efidisk.c
View file

@ -627,11 +627,11 @@ static struct grub_disk_dev grub_efidisk_dev =
{ {
.name = "efidisk", .name = "efidisk",
.id = GRUB_DISK_DEVICE_EFIDISK_ID, .id = GRUB_DISK_DEVICE_EFIDISK_ID,
.iterate = grub_efidisk_iterate, .disk_iterate = grub_efidisk_iterate,
.open = grub_efidisk_open, .disk_open = grub_efidisk_open,
.close = grub_efidisk_close, .disk_close = grub_efidisk_close,
.read = grub_efidisk_read, .disk_read = grub_efidisk_read,
.write = grub_efidisk_write, .disk_write = grub_efidisk_write,
.next = 0 .next = 0
}; };

10
grub-core/disk/host.c
View file

@ -84,11 +84,11 @@ static struct grub_disk_dev grub_host_dev =
/* The only important line in this file :-) */ /* The only important line in this file :-) */
.name = "host", .name = "host",
.id = GRUB_DISK_DEVICE_HOST_ID, .id = GRUB_DISK_DEVICE_HOST_ID,
.iterate = grub_host_iterate, .disk_iterate = grub_host_iterate,
.open = grub_host_open, .disk_open = grub_host_open,
.close = grub_host_close, .disk_close = grub_host_close,
.read = grub_host_read, .disk_read = grub_host_read,
.write = grub_host_write, .disk_write = grub_host_write,
.next = 0 .next = 0
}; };

10
grub-core/disk/i386/pc/biosdisk.c
View file

@ -637,11 +637,11 @@ static struct grub_disk_dev grub_biosdisk_dev =
{ {
.name = "biosdisk", .name = "biosdisk",
.id = GRUB_DISK_DEVICE_BIOSDISK_ID, .id = GRUB_DISK_DEVICE_BIOSDISK_ID,
.iterate = grub_biosdisk_iterate, .disk_iterate = grub_biosdisk_iterate,
.open = grub_biosdisk_open, .disk_open = grub_biosdisk_open,
.close = grub_biosdisk_close, .disk_close = grub_biosdisk_close,
.read = grub_biosdisk_read, .disk_read = grub_biosdisk_read,
.write = grub_biosdisk_write, .disk_write = grub_biosdisk_write,
.next = 0 .next = 0
}; };

10
grub-core/disk/ieee1275/nand.c
View file

@ -223,11 +223,11 @@ static struct grub_disk_dev grub_nand_dev =
{ {
.name = "nand", .name = "nand",
.id = GRUB_DISK_DEVICE_NAND_ID, .id = GRUB_DISK_DEVICE_NAND_ID,
.iterate = grub_nand_iterate, .disk_iterate = grub_nand_iterate,
.open = grub_nand_open, .disk_open = grub_nand_open,
.close = grub_nand_close, .disk_close = grub_nand_close,
.read = grub_nand_read, .disk_read = grub_nand_read,
.write = grub_nand_write, .disk_write = grub_nand_write,
.next = 0 .next = 0
}; };

8
grub-core/disk/ieee1275/obdisk.c
View file

@ -1047,10 +1047,10 @@ static struct grub_disk_dev grub_obdisk_dev =
{ {
.name = "obdisk", .name = "obdisk",
.id = GRUB_DISK_DEVICE_OBDISK_ID, .id = GRUB_DISK_DEVICE_OBDISK_ID,
.iterate = grub_obdisk_iterate, .disk_iterate = grub_obdisk_iterate,
.open = grub_obdisk_open, .disk_open = grub_obdisk_open,
.close = grub_obdisk_close, .disk_close = grub_obdisk_close,
.read = grub_obdisk_read, .disk_read = grub_obdisk_read,
}; };
void void

10
grub-core/disk/ieee1275/ofdisk.c
View file

@ -615,11 +615,11 @@ static struct grub_disk_dev grub_ofdisk_dev =
{ {
.name = "ofdisk", .name = "ofdisk",
.id = GRUB_DISK_DEVICE_OFDISK_ID, .id = GRUB_DISK_DEVICE_OFDISK_ID,
.iterate = grub_ofdisk_iterate, .disk_iterate = grub_ofdisk_iterate,
.open = grub_ofdisk_open, .disk_open = grub_ofdisk_open,
.close = grub_ofdisk_close, .disk_close = grub_ofdisk_close,
.read = grub_ofdisk_read, .disk_read = grub_ofdisk_read,
.write = grub_ofdisk_write, .disk_write = grub_ofdisk_write,
.next = 0 .next = 0
}; };

8
grub-core/disk/loopback.c
View file

@ -222,10 +222,10 @@ static struct grub_disk_dev grub_loopback_dev =
{ {
.name = "loopback", .name = "loopback",
.id = GRUB_DISK_DEVICE_LOOPBACK_ID, .id = GRUB_DISK_DEVICE_LOOPBACK_ID,
.iterate = grub_loopback_iterate, .disk_iterate = grub_loopback_iterate,
.open = grub_loopback_open, .disk_open = grub_loopback_open,
.read = grub_loopback_read, .disk_read = grub_loopback_read,
.write = grub_loopback_write, .disk_write = grub_loopback_write,
.next = 0 .next = 0
}; };

10
grub-core/disk/memdisk.c
View file

@ -77,11 +77,11 @@ static struct grub_disk_dev grub_memdisk_dev =
{ {
.name = "memdisk", .name = "memdisk",
.id = GRUB_DISK_DEVICE_MEMDISK_ID, .id = GRUB_DISK_DEVICE_MEMDISK_ID,
.iterate = grub_memdisk_iterate, .disk_iterate = grub_memdisk_iterate,
.open = grub_memdisk_open, .disk_open = grub_memdisk_open,
.close = grub_memdisk_close, .disk_close = grub_memdisk_close,
.read = grub_memdisk_read, .disk_read = grub_memdisk_read,
.write = grub_memdisk_write, .disk_write = grub_memdisk_write,
.next = 0 .next = 0
}; };

10
grub-core/disk/scsi.c
View file

@ -747,11 +747,11 @@ static struct grub_disk_dev grub_scsi_dev =
{ {
.name = "scsi", .name = "scsi",
.id = GRUB_DISK_DEVICE_SCSI_ID, .id = GRUB_DISK_DEVICE_SCSI_ID,
.iterate = grub_scsi_iterate, .disk_iterate = grub_scsi_iterate,
.open = grub_scsi_open, .disk_open = grub_scsi_open,
.close = grub_scsi_close, .disk_close = grub_scsi_close,
.read = grub_scsi_read, .disk_read = grub_scsi_read,
.write = grub_scsi_write, .disk_write = grub_scsi_write,
.next = 0 .next = 0
}; };

10
grub-core/disk/uboot/ubootdisk.c
View file

@ -286,11 +286,11 @@ uboot_disk_write (struct grub_disk *disk,
static struct grub_disk_dev grub_ubootdisk_dev = { static struct grub_disk_dev grub_ubootdisk_dev = {
.name = "ubootdisk", .name = "ubootdisk",
.id = GRUB_DISK_DEVICE_UBOOTDISK_ID, .id = GRUB_DISK_DEVICE_UBOOTDISK_ID,
.iterate = uboot_disk_iterate, .disk_iterate = uboot_disk_iterate,
.open = uboot_disk_open, .disk_open = uboot_disk_open,
.close = uboot_disk_close, .disk_close = uboot_disk_close,
.read = uboot_disk_read, .disk_read = uboot_disk_read,
.write = uboot_disk_write, .disk_write = uboot_disk_write,
.next = 0 .next = 0
}; };

10
grub-core/disk/xen/xendisk.c
View file

@ -249,11 +249,11 @@ grub_virtdisk_write (grub_disk_t disk, grub_disk_addr_t sector,
static struct grub_disk_dev grub_virtdisk_dev = { static struct grub_disk_dev grub_virtdisk_dev = {
.name = "xen", .name = "xen",
.id = GRUB_DISK_DEVICE_XEN, .id = GRUB_DISK_DEVICE_XEN,
.iterate = grub_virtdisk_iterate, .disk_iterate = grub_virtdisk_iterate,
.open = grub_virtdisk_open, .disk_open = grub_virtdisk_open,
.close = grub_virtdisk_close, .disk_close = grub_virtdisk_close,
.read = grub_virtdisk_read, .disk_read = grub_virtdisk_read,
.write = grub_virtdisk_write, .disk_write = grub_virtdisk_write,
.next = 0 .next = 0
}; };

10
grub-core/fs/cbfs.c
View file

@ -328,11 +328,11 @@ static struct grub_disk_dev grub_cbfsdisk_dev =
{ {
.name = "cbfsdisk", .name = "cbfsdisk",
.id = GRUB_DISK_DEVICE_CBFSDISK_ID, .id = GRUB_DISK_DEVICE_CBFSDISK_ID,
.iterate = grub_cbfsdisk_iterate, .disk_iterate = grub_cbfsdisk_iterate,
.open = grub_cbfsdisk_open, .disk_open = grub_cbfsdisk_open,
.close = grub_cbfsdisk_close, .disk_close = grub_cbfsdisk_close,
.read = grub_cbfsdisk_read, .disk_read = grub_cbfsdisk_read,
.write = grub_cbfsdisk_write, .disk_write = grub_cbfsdisk_write,
.next = 0 .next = 0
}; };

10
grub-core/fs/proc.c
View file

@ -172,11 +172,11 @@ grub_procfs_open (struct grub_file *file, const char *path)
static struct grub_disk_dev grub_procfs_dev = { static struct grub_disk_dev grub_procfs_dev = {
.name = "proc", .name = "proc",
.id = GRUB_DISK_DEVICE_PROCFS_ID, .id = GRUB_DISK_DEVICE_PROCFS_ID,
.iterate = grub_procdev_iterate, .disk_iterate = grub_procdev_iterate,
.open = grub_procdev_open, .disk_open = grub_procdev_open,
.close = grub_procdev_close, .disk_close = grub_procdev_close,
.read = grub_procdev_read, .disk_read = grub_procdev_read,
.write = grub_procdev_write, .disk_write = grub_procdev_write,
.next = 0 .next = 0
}; };

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

@ -223,7 +223,7 @@ grub_disk_open (const char *name)
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) == GRUB_ERR_NONE) if ((dev->disk_open) (raw, disk) == GRUB_ERR_NONE)
break; break;
else if (grub_errno == GRUB_ERR_UNKNOWN_DEVICE) else if (grub_errno == GRUB_ERR_UNKNOWN_DEVICE)
grub_errno = GRUB_ERR_NONE; grub_errno = GRUB_ERR_NONE;
@ -294,8 +294,8 @@ grub_disk_close (grub_disk_t disk)
grub_partition_t part; grub_partition_t part;
grub_dprintf ("disk", "Closing `%s'.\n", disk->name); grub_dprintf ("disk", "Closing `%s'.\n", disk->name);
if (disk->dev && disk->dev->close) if (disk->dev && disk->dev->disk_close)
(disk->dev->close) (disk); (disk->dev->disk_close) (disk);
/* Reset the timer. */ /* Reset the timer. */
grub_last_time = grub_get_time_ms (); grub_last_time = grub_get_time_ms ();
@ -341,10 +341,10 @@ grub_disk_read_small_real (grub_disk_t disk, grub_disk_addr_t sector,
< (disk->total_sectors << (disk->log_sector_size - GRUB_DISK_SECTOR_BITS))) < (disk->total_sectors << (disk->log_sector_size - GRUB_DISK_SECTOR_BITS)))
{ {
grub_err_t err; grub_err_t err;
err = (disk->dev->read) (disk, transform_sector (disk, sector), err = (disk->dev->disk_read) (disk, transform_sector (disk, sector),
1U << (GRUB_DISK_CACHE_BITS 1U << (GRUB_DISK_CACHE_BITS
+ GRUB_DISK_SECTOR_BITS + GRUB_DISK_SECTOR_BITS
- disk->log_sector_size), tmp_buf); - disk->log_sector_size), tmp_buf);
if (!err) if (!err)
{ {
/* Copy it and store it in the disk cache. */ /* Copy it and store it in the disk cache. */
@ -377,8 +377,8 @@ grub_disk_read_small_real (grub_disk_t disk, grub_disk_addr_t sector,
if (!tmp_buf) if (!tmp_buf)
return grub_errno; return grub_errno;
if ((disk->dev->read) (disk, transform_sector (disk, aligned_sector), if ((disk->dev->disk_read) (disk, transform_sector (disk, aligned_sector),
num, tmp_buf)) num, tmp_buf))
{ {
grub_error_push (); grub_error_push ();
grub_dprintf ("disk", "%s read failed\n", disk->name); grub_dprintf ("disk", "%s read failed\n", disk->name);
@ -483,11 +483,11 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
{ {
grub_disk_addr_t i; grub_disk_addr_t i;
err = (disk->dev->read) (disk, transform_sector (disk, sector), err = (disk->dev->disk_read) (disk, transform_sector (disk, sector),
agglomerate << (GRUB_DISK_CACHE_BITS agglomerate << (GRUB_DISK_CACHE_BITS
+ GRUB_DISK_SECTOR_BITS + GRUB_DISK_SECTOR_BITS
- disk->log_sector_size), - disk->log_sector_size),
buf); buf);
if (err) if (err)
return err; return err;

10
grub-core/kern/emu/hostdisk.c
View file

@ -388,11 +388,11 @@ static struct grub_disk_dev grub_util_biosdisk_dev =
{ {
.name = "hostdisk", .name = "hostdisk",
.id = GRUB_DISK_DEVICE_HOSTDISK_ID, .id = GRUB_DISK_DEVICE_HOSTDISK_ID,
.iterate = grub_util_biosdisk_iterate, .disk_iterate = grub_util_biosdisk_iterate,
.open = grub_util_biosdisk_open, .disk_open = grub_util_biosdisk_open,
.close = grub_util_biosdisk_close, .disk_close = grub_util_biosdisk_close,
.read = grub_util_biosdisk_read, .disk_read = grub_util_biosdisk_read,
.write = grub_util_biosdisk_write, .disk_write = grub_util_biosdisk_write,
.next = 0 .next = 0
}; };

8
grub-core/lib/disk.c
View file

@ -101,8 +101,8 @@ grub_disk_write (grub_disk_t disk, grub_disk_addr_t sector,
grub_disk_cache_invalidate (disk->dev->id, disk->id, sector); grub_disk_cache_invalidate (disk->dev->id, disk->id, sector);
if ((disk->dev->write) (disk, transform_sector (disk, sector), if ((disk->dev->disk_write) (disk, transform_sector (disk, sector),
1, tmp_buf) != GRUB_ERR_NONE) 1, tmp_buf) != GRUB_ERR_NONE)
{ {
grub_free (tmp_buf); grub_free (tmp_buf);
goto finish; goto finish;
@ -130,8 +130,8 @@ grub_disk_write (grub_disk_t disk, grub_disk_addr_t sector,
<< (GRUB_DISK_CACHE_BITS + GRUB_DISK_SECTOR_BITS << (GRUB_DISK_CACHE_BITS + GRUB_DISK_SECTOR_BITS
- disk->log_sector_size)); - disk->log_sector_size));
if ((disk->dev->write) (disk, transform_sector (disk, sector), if ((disk->dev->disk_write) (disk, transform_sector (disk, sector),
n, buf) != GRUB_ERR_NONE) n, buf) != GRUB_ERR_NONE)
goto finish; goto finish;
while (n--) while (n--)

16
include/grub/disk.h
View file

@ -77,26 +77,26 @@ struct grub_disk_dev
enum grub_disk_dev_id id; enum grub_disk_dev_id id;
/* Call HOOK with each device name, until HOOK returns non-zero. */ /* Call HOOK with each device name, until HOOK returns non-zero. */
int (*iterate) (grub_disk_dev_iterate_hook_t hook, void *hook_data, int (*disk_iterate) (grub_disk_dev_iterate_hook_t hook, void *hook_data,
grub_disk_pull_t pull); grub_disk_pull_t pull);
/* Open the device named NAME, and set up DISK. */ /* Open the device named NAME, and set up DISK. */
grub_err_t (*open) (const char *name, struct grub_disk *disk); grub_err_t (*disk_open) (const char *name, struct grub_disk *disk);
/* Close the disk DISK. */ /* Close the disk DISK. */
void (*close) (struct grub_disk *disk); void (*disk_close) (struct grub_disk *disk);
/* Read SIZE sectors from the sector SECTOR of the disk DISK into BUF. */ /* Read SIZE sectors from the sector SECTOR of the disk DISK into BUF. */
grub_err_t (*read) (struct grub_disk *disk, grub_disk_addr_t sector, grub_err_t (*disk_read) (struct grub_disk *disk, grub_disk_addr_t sector,
grub_size_t size, char *buf); grub_size_t size, char *buf);
/* Write SIZE sectors from BUF into the sector SECTOR of the disk DISK. */ /* Write SIZE sectors from BUF into the sector SECTOR of the disk DISK. */
grub_err_t (*write) (struct grub_disk *disk, grub_disk_addr_t sector, grub_err_t (*disk_write) (struct grub_disk *disk, grub_disk_addr_t sector,
grub_size_t size, const char *buf); grub_size_t size, const char *buf);
#ifdef GRUB_UTIL #ifdef GRUB_UTIL
struct grub_disk_memberlist *(*memberlist) (struct grub_disk *disk); struct grub_disk_memberlist *(*disk_memberlist) (struct grub_disk *disk);
const char * (*raidname) (struct grub_disk *disk); const char * (*disk_raidname) (struct grub_disk *disk);
#endif #endif
/* The next disk device. */ /* The next disk device. */
@ -187,7 +187,7 @@ grub_disk_dev_iterate (grub_disk_dev_iterate_hook_t hook, void *hook_data)
for (pull = 0; pull < GRUB_DISK_PULL_MAX; pull++) for (pull = 0; pull < GRUB_DISK_PULL_MAX; pull++)
for (p = grub_disk_dev_list; p; p = p->next) for (p = grub_disk_dev_list; p; p = p->next)
if (p->iterate && (p->iterate) (hook, hook_data, pull)) if (p->disk_iterate && (p->disk_iterate) (hook, hook_data, pull))
return 1; return 1;
return 0; return 0;

12
util/grub-install.c
View file

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

16
util/grub-probe.c
View file

@ -171,9 +171,9 @@ probe_partmap (grub_disk_t disk, char delim)
grub_diskfilter_get_partmap (disk, do_print, &delim); grub_diskfilter_get_partmap (disk, do_print, &delim);
/* In case of LVM/RAID, check the member devices as well. */ /* 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) while (list)
{ {
@ -229,9 +229,9 @@ probe_cryptodisk_uuid (grub_disk_t disk, char delim)
grub_disk_memberlist_t list = NULL, tmp; grub_disk_memberlist_t list = NULL, tmp;
/* In case of LVM/RAID, check the member devices as well. */ /* 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) while (list)
{ {
@ -272,8 +272,8 @@ probe_abstraction (grub_disk_t disk, char delim)
grub_disk_memberlist_t list = NULL, tmp; grub_disk_memberlist_t list = NULL, tmp;
int raid_level; int raid_level;
if (disk->dev->memberlist) if (disk->dev->disk_memberlist)
list = disk->dev->memberlist (disk); list = disk->dev->disk_memberlist (disk);
while (list) while (list)
{ {
probe_abstraction (list->disk, delim); probe_abstraction (list->disk, delim);
@ -299,8 +299,8 @@ probe_abstraction (grub_disk_t disk, char delim)
if (raid_level >= 0) if (raid_level >= 0)
{ {
printf ("diskfilter%c", delim); printf ("diskfilter%c", delim);
if (disk->dev->raidname) if (disk->dev->disk_raidname)
printf ("%s%c", disk->dev->raidname (disk), delim); printf ("%s%c", disk->dev->disk_raidname (disk), delim);
} }
if (raid_level == 5) if (raid_level == 5)
printf ("raid5rec%c", delim); printf ("raid5rec%c", delim);