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

	informative verbose message.
	(read_lv): Handle 64-bit segment size.

diff --git a/ChangeLog b/ChangeLog
index 548680e9894932f87f48b06d540fb288627a997b..cb967fd376da8f05be77f504dcb293a28fcf8c7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * grub-core/disk/lvm.c (grub_lvm_getvalue): Handle 64-bit values.

diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
index f06072591b14674343bca77d37ac11d82a90a885..6e9745e350e8104f1e66fa33e45f5f45586b6c8e 100644 (file)
--- a/grub-core/disk/diskfilter.c
+++ b/grub-core/disk/diskfilter.c
@@ -152,6 +152,10 @@ scan_disk (const char *name, int accept_diskfilter)
 
       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.uuidlen = 0;
          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_segment *seg = lv->segments;
       grub_uint64_t extent;
-      grub_size_t to_read;
+      grub_uint64_t to_read;
 
       extent = grub_divmod64 (sector, vg->extent_size, NULL);