%B

@@ -19,10 +19,11 @@
  * CDDL HEADER END
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
 /* Portions Copyright 2010 Robert Milkowski */
 
 #include <sys/zio.h>

@@ -94,10 +95,12 @@
                 { "gzip-6",     ZIO_COMPRESS_GZIP_6 },
                 { "gzip-7",     ZIO_COMPRESS_GZIP_7 },
                 { "gzip-8",     ZIO_COMPRESS_GZIP_8 },
                 { "gzip-9",     ZIO_COMPRESS_GZIP_9 },
                 { "zle",        ZIO_COMPRESS_ZLE },
+                { "lz4",        ZIO_COMPRESS_LZ4 },
+                { "lz4hc",      ZIO_COMPRESS_LZ4HC },
                 { NULL }
         };
 
         static zprop_index_t snapdir_table[] = {
                 { "hidden",     ZFS_SNAPDIR_HIDDEN },

@@ -209,12 +212,12 @@
             "on | off | verify | sha256[,verify]", "DEDUP",
             dedup_table);
         zprop_register_index(ZFS_PROP_COMPRESSION, "compression",
             ZIO_COMPRESS_DEFAULT, PROP_INHERIT,
             ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
-            "on | off | lzjb | gzip | gzip-[1-9] | zle", "COMPRESS",
-            compress_table);
+            "on | off | lzjb | gzip | gzip-[1-9] | zle | lz4 | lz4hc",
+            "COMPRESS", compress_table);
         zprop_register_index(ZFS_PROP_SNAPDIR, "snapdir", ZFS_SNAPDIR_HIDDEN,
             PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
             "hidden | visible", "SNAPDIR", snapdir_table);
         zprop_register_index(ZFS_PROP_ACLMODE, "aclmode", ZFS_ACL_DISCARD,
             PROP_INHERIT, ZFS_TYPE_FILESYSTEM,