Print this page
%B

Split Close
Expand all
Collapse all
          --- old/usr/src/common/zfs/zfs_prop.c
          +++ new/usr/src/common/zfs/zfs_prop.c
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23   * Copyright (c) 2011 by Delphix. All rights reserved.
       24 + * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  24   25   */
  25   26  
  26   27  /* Portions Copyright 2010 Robert Milkowski */
  27   28  
  28   29  #include <sys/zio.h>
  29   30  #include <sys/spa.h>
  30   31  #include <sys/u8_textprep.h>
  31   32  #include <sys/zfs_acl.h>
  32   33  #include <sys/zfs_ioctl.h>
  33   34  #include <sys/zfs_znode.h>
↓ open down ↓ 55 lines elided ↑ open up ↑
  89   90                  { "gzip-1",     ZIO_COMPRESS_GZIP_1 },
  90   91                  { "gzip-2",     ZIO_COMPRESS_GZIP_2 },
  91   92                  { "gzip-3",     ZIO_COMPRESS_GZIP_3 },
  92   93                  { "gzip-4",     ZIO_COMPRESS_GZIP_4 },
  93   94                  { "gzip-5",     ZIO_COMPRESS_GZIP_5 },
  94   95                  { "gzip-6",     ZIO_COMPRESS_GZIP_6 },
  95   96                  { "gzip-7",     ZIO_COMPRESS_GZIP_7 },
  96   97                  { "gzip-8",     ZIO_COMPRESS_GZIP_8 },
  97   98                  { "gzip-9",     ZIO_COMPRESS_GZIP_9 },
  98   99                  { "zle",        ZIO_COMPRESS_ZLE },
      100 +                { "lz4",        ZIO_COMPRESS_LZ4 },
      101 +                { "lz4hc",      ZIO_COMPRESS_LZ4HC },
  99  102                  { NULL }
 100  103          };
 101  104  
 102  105          static zprop_index_t snapdir_table[] = {
 103  106                  { "hidden",     ZFS_SNAPDIR_HIDDEN },
 104  107                  { "visible",    ZFS_SNAPDIR_VISIBLE },
 105  108                  { NULL }
 106  109          };
 107  110  
 108  111          static zprop_index_t acl_mode_table[] = {
↓ open down ↓ 95 lines elided ↑ open up ↑
 204  207              ZFS_TYPE_VOLUME,
 205  208              "on | off | fletcher2 | fletcher4 | sha256", "CHECKSUM",
 206  209              checksum_table);
 207  210          zprop_register_index(ZFS_PROP_DEDUP, "dedup", ZIO_CHECKSUM_OFF,
 208  211              PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
 209  212              "on | off | verify | sha256[,verify]", "DEDUP",
 210  213              dedup_table);
 211  214          zprop_register_index(ZFS_PROP_COMPRESSION, "compression",
 212  215              ZIO_COMPRESS_DEFAULT, PROP_INHERIT,
 213  216              ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
 214      -            "on | off | lzjb | gzip | gzip-[1-9] | zle", "COMPRESS",
 215      -            compress_table);
      217 +            "on | off | lzjb | gzip | gzip-[1-9] | zle | lz4 | lz4hc",
      218 +            "COMPRESS", compress_table);
 216  219          zprop_register_index(ZFS_PROP_SNAPDIR, "snapdir", ZFS_SNAPDIR_HIDDEN,
 217  220              PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
 218  221              "hidden | visible", "SNAPDIR", snapdir_table);
 219  222          zprop_register_index(ZFS_PROP_ACLMODE, "aclmode", ZFS_ACL_DISCARD,
 220  223              PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
 221  224              "discard | groupmask | passthrough | restricted", "ACLMODE",
 222  225              acl_mode_table);
 223  226          zprop_register_index(ZFS_PROP_ACLINHERIT, "aclinherit",
 224  227              ZFS_ACL_RESTRICTED, PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
 225  228              "discard | noallow | restricted | passthrough | passthrough-x",
↓ open down ↓ 395 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX