* grub-core/disk/diskfilter.c (scan_disk) [GRUB_UTIL]: Put more

informative verbose message.
	(read_lv): Handle 64-bit segment size.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-25 17:54:46 +02:00
parent 315654c269
commit 754ad9ebbe
2 changed files with 11 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2012-06-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/diskfilter.c (scan_disk) [GRUB_UTIL]: Put more
informative verbose message.
(read_lv): Handle 64-bit segment size.
2012-06-25 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/lvm.c (grub_lvm_getvalue): Handle 64-bit values. * grub-core/disk/lvm.c (grub_lvm_getvalue): Handle 64-bit values.

View file

@ -152,6 +152,10 @@ scan_disk (const char *name, int accept_diskfilter)
for (diskfilter = grub_diskfilter_list; diskfilter; diskfilter = diskfilter->next) for (diskfilter = grub_diskfilter_list; diskfilter; diskfilter = diskfilter->next)
{ {
#ifdef GRUB_UTIL
grub_util_info ("Scanning for %s devices on disk %s",
diskfilter->name, name);
#endif
id.uuid = 0; id.uuid = 0;
id.uuidlen = 0; id.uuidlen = 0;
arr = diskfilter->detect (disk, &id, &start_sector); arr = diskfilter->detect (disk, &id, &start_sector);
@ -780,7 +784,7 @@ read_lv (struct grub_diskfilter_lv *lv, grub_disk_addr_t sector,
struct grub_diskfilter_vg *vg = lv->vg; struct grub_diskfilter_vg *vg = lv->vg;
struct grub_diskfilter_segment *seg = lv->segments; struct grub_diskfilter_segment *seg = lv->segments;
grub_uint64_t extent; grub_uint64_t extent;
grub_size_t to_read; grub_uint64_t to_read;
extent = grub_divmod64 (sector, vg->extent_size, NULL); extent = grub_divmod64 (sector, vg->extent_size, NULL);