* grub-core/fs/zfs/zfs.c (recovery): Fix spelling.

	(read_device): Fix size calculation.

diff --git a/ChangeLog b/ChangeLog
index cb98ebf0afeee8e30f608cf57c556a751978c6d7..52da3c3a6e57278d1a4924661af86b2d05cd02f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/zfs/zfs.c (recovery): Fix spelling.
+       (read_device): Fix size calculation.
+
 2011-11-25  Robert Millan  <rmh@gnu.org>
 
        * util/getroot.c [HAVE_LIMITS_H]: Include `<limits.h>'.

diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index 83a067237e2a1904ebdc487ca5b10ad013ca5ea8..be659f52c28c3eec64ee3ad8167e02aba5abd005 100644 (file)
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -1001,7 +1001,7 @@ recovery (grub_uint8_t *bufs[4], grub_size_t s, const int nbufs,
          const unsigned *powers,
          const int *idx)
 {
-  grub_dprintf ("zfs", "recovering %u bufers\n", nbufs);
+  grub_dprintf ("zfs", "recovering %u buffers\n", nbufs);
   /* Now we have */
   /* b_i = sum (r_j* (x ** (powers[i] * idx[j])))*/
   /* Let's invert the matrix in question. */
@@ -1338,8 +1338,8 @@ read_device (grub_uint64_t offset, struct grub_zfs_device_desc *desc,
              {
                grub_uint8_t *tmp_recovery_buf[4];
                for (j = 0; j < i; j++)
-                 tmp_recovery_buf[j] = recovery_buf[j] + recovery_len[j] - 1;
-               err = recovery (tmp_recovery_buf, 1, i, redundancy_pow,
+                 tmp_recovery_buf[j] = recovery_buf[j] + recovery_len[failed_devices - 1];
+               err = recovery (tmp_recovery_buf, recovery_len[0] - recovery_len[failed_devices - 1], i, redundancy_pow,
                                recovery_idx);
                if (err)
                  return err;