* grub-core/fs/zfs/zfs.c (uberblock_verify): New parameter size.

	All users updated.
	(find_bestub): Determine correct size.
	(fill_vdev_info_real): Fill ashift. New argument. All users updated.
	(scan_disk): Align the size down.
	Call check pool before find_bestub to have ashift.
Note: real text was accidently commited 2 commits ago.

	Also-By: Richard Laager <rlaager@wiktel.com>
	Also-By: Vladimir Serbinenko <phcoder@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index c0b4a2463db8ecdb3bbd9bd430f74dd625f064bd..431bf4493454b49534de6efb2fcc6c08a1f2bfa5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
+2012-01-22  Zachary Bedell <pendorbound@gmail.com>
+2012-01-22  Richard Laager <rlaager@wiktel.com>
+
+       * grub-core/fs/zfs/zfs.c (uberblock_verify): New parameter size.
+       All users updated.
+       (find_bestub): Determine correct size.
+       (fill_vdev_info_real): Fill ashift. New argument. All users updated.
+       (scan_disk): Align the size down.
+       Call check pool before find_bestub to have ashift.
+
 2012-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/lib/relocator.c (malloc_in_range): Remove couple of