ZFS zlib support

	* grub-core/fs/zfs/zfs.c (zlib_decompress): New function.
	(decomp_table): Add zlib entries.
	(zio_read): USe 8 bits for compression function rather than 3.
	* include/grub/zfs/zio.h (zio_compress): Add zlib values.

diff --git a/ChangeLog b/ChangeLog
index 6535b6e17ca05a40f63109686792ef32e8305163..954166148c05ff7b1dfb9040bf99ec98683025bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2011-06-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       ZFS zlib support
+
+       * grub-core/fs/zfs/zfs.c (zlib_decompress): New function.
+       (decomp_table): Add zlib entries.
+       (zio_read): USe 8 bits for compression function rather than 3.
+       * include/grub/zfs/zio.h (zio_compress): Add zlib values.
+
+2011-06-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/ahci.c: Add missing license statements.
+       * grub-core/fs/romfs.c: Likewise.
+       * grub-core/lib/ia64/setjmp.S: Likewise.
+       * grub-core/loader/i386/pc/freedos.c: Likewise.
+       * grub-core/loader/ia64/efi/linux.c: Likewise.
+       * grub-core/video/colors.c: Likewise.
+       * include/grub/dl.h (GRUB_MOD_DEP): New macro.
+
 2011-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        AHCI support.

diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index 8d86cf9e5a8e35674db43d2b2173b80878f0dc9e..1eea13b263e54b786f295852b7e5fda331edbdca 100644 (file)
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -51,6 +51,7 @@
 #include <grub/zfs/sa_impl.h>
 #include <grub/zfs/dsl_dir.h>
 #include <grub/zfs/dsl_dataset.h>
+#include <grub/deflate.h>
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
@@ -163,13 +164,30 @@ struct grub_zfs_data
   grub_disk_addr_t vdev_phys_sector;
 };
 
+static grub_err_t 
+zlib_decompress (void *s, void *d,
+                grub_size_t slen, grub_size_t dlen)
+{
+  if (grub_zlib_decompress (s, slen, 0, d, dlen) < 0)
+    return grub_errno;
+  return GRUB_ERR_NONE;
+}
+
 static decomp_entry_t decomp_table[ZIO_COMPRESS_FUNCTIONS] = {
   {"inherit", NULL},           /* ZIO_COMPRESS_INHERIT */
   {"on", lzjb_decompress},     /* ZIO_COMPRESS_ON */
   {"off", NULL},               /* ZIO_COMPRESS_OFF */
   {"lzjb", lzjb_decompress},   /* ZIO_COMPRESS_LZJB */
   {"empty", NULL},             /* ZIO_COMPRESS_EMPTY */
-  {"gzip", NULL},              /* ZIO_COMPRESS_GZIP */
+  {"gzip-1", zlib_decompress},  /* ZIO_COMPRESS_GZIP1 */
+  {"gzip-2", zlib_decompress},  /* ZIO_COMPRESS_GZIP2 */
+  {"gzip-3", zlib_decompress},  /* ZIO_COMPRESS_GZIP3 */
+  {"gzip-4", zlib_decompress},  /* ZIO_COMPRESS_GZIP4 */
+  {"gzip-5", zlib_decompress},  /* ZIO_COMPRESS_GZIP5 */
+  {"gzip-6", zlib_decompress},  /* ZIO_COMPRESS_GZIP6 */
+  {"gzip-7", zlib_decompress},  /* ZIO_COMPRESS_GZIP7 */
+  {"gzip-8", zlib_decompress},  /* ZIO_COMPRESS_GZIP8 */
+  {"gzip-9", zlib_decompress},  /* ZIO_COMPRESS_GZIP9 */
 };
 
 static grub_err_t zio_read_data (blkptr_t * bp, grub_zfs_endian_t endian,
@@ -527,7 +545,7 @@ zio_read (blkptr_t * bp, grub_zfs_endian_t endian, void **buf,
   *buf = NULL;
 
   checksum = (grub_zfs_to_cpu64((bp)->blk_prop, endian) >> 40) & 0xff;
-  comp = (grub_zfs_to_cpu64((bp)->blk_prop, endian)>>32) & 0x7;
+  comp = (grub_zfs_to_cpu64((bp)->blk_prop, endian)>>32) & 0xff;
   lsize = (BP_IS_HOLE(bp) ? 0 :
           (((grub_zfs_to_cpu64 ((bp)->blk_prop, endian) & 0xffff) + 1)
            << SPA_MINBLOCKSHIFT));

diff --git a/include/grub/zfs/zio.h b/include/grub/zfs/zio.h
index 797d4f9b3a8584a14a9e662e44e7c1dc5fc5dda6..3dafb402800577e6020c8bf08fb348bc1b0afa33 100644 (file)
--- a/include/grub/zfs/zio.h
+++ b/include/grub/zfs/zio.h
@@ -77,7 +77,15 @@ enum zio_compress {
        ZIO_COMPRESS_OFF,
        ZIO_COMPRESS_LZJB,
        ZIO_COMPRESS_EMPTY,
-       ZIO_COMPRESS_GZIP,
+       ZIO_COMPRESS_GZIP1,
+       ZIO_COMPRESS_GZIP2,
+       ZIO_COMPRESS_GZIP3,
+       ZIO_COMPRESS_GZIP4,
+       ZIO_COMPRESS_GZIP5,
+       ZIO_COMPRESS_GZIP6,
+       ZIO_COMPRESS_GZIP7,
+       ZIO_COMPRESS_GZIP8,
+       ZIO_COMPRESS_GZIP9,
        ZIO_COMPRESS_FUNCTIONS
 };