Update core ZFS code from build 121 to build 141.
[zfs.git] / module / zcommon / zfs_prop.c
index effd2db..f29bcf6 100644 (file)
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
+/* Portions Copyright 2010 Robert Milkowski */
+
 #include <sys/zio.h>
 #include <sys/spa.h>
 #include <sys/u8_textprep.h>
 
 static zprop_desc_t zfs_prop_table[ZFS_NUM_PROPS];
 
+/* Note this is indexed by zfs_userquota_prop_t, keep the order the same */
+const char *zfs_userquota_prop_prefixes[] = {
+       "userused@",
+       "userquota@",
+       "groupused@",
+       "groupquota@"
+};
+
 zprop_desc_t *
 zfs_prop_get_table(void)
 {
@@ -61,6 +70,16 @@ zfs_prop_init(void)
                { NULL }
        };
 
+       static zprop_index_t dedup_table[] = {
+               { "on",         ZIO_CHECKSUM_ON },
+               { "off",        ZIO_CHECKSUM_OFF },
+               { "verify",     ZIO_CHECKSUM_ON | ZIO_CHECKSUM_VERIFY },
+               { "sha256",     ZIO_CHECKSUM_SHA256 },
+               { "sha256,verify",
+                               ZIO_CHECKSUM_SHA256 | ZIO_CHECKSUM_VERIFY },
+               { NULL }
+       };
+
        static zprop_index_t compress_table[] = {
                { "on",         ZIO_COMPRESS_ON },
                { "off",        ZIO_COMPRESS_OFF },
@@ -75,6 +94,7 @@ zfs_prop_init(void)
                { "gzip-7",     ZIO_COMPRESS_GZIP_7 },
                { "gzip-8",     ZIO_COMPRESS_GZIP_8 },
                { "gzip-9",     ZIO_COMPRESS_GZIP_9 },
+               { "zle",        ZIO_COMPRESS_ZLE },
                { NULL }
        };
 
@@ -84,13 +104,6 @@ zfs_prop_init(void)
                { NULL }
        };
 
-       static zprop_index_t acl_mode_table[] = {
-               { "discard",    ZFS_ACL_DISCARD },
-               { "groupmask",  ZFS_ACL_GROUPMASK },
-               { "passthrough", ZFS_ACL_PASSTHROUGH },
-               { NULL }
-       };
-
        static zprop_index_t acl_inherit_table[] = {
                { "discard",    ZFS_ACL_DISCARD },
                { "noallow",    ZFS_ACL_NOALLOW },
@@ -133,6 +146,8 @@ zfs_prop_init(void)
                { "1",          1 },
                { "2",          2 },
                { "3",          3 },
+               { "4",          4 },
+               { "5",          5 },
                { "current",    ZPL_VERSION },
                { NULL }
        };
@@ -143,6 +158,12 @@ zfs_prop_init(void)
                { NULL }
        };
 
+       static zprop_index_t logbias_table[] = {
+               { "latency",    ZFS_LOGBIAS_LATENCY },
+               { "throughput", ZFS_LOGBIAS_THROUGHPUT },
+               { NULL }
+       };
+
        static zprop_index_t canmount_table[] = {
                { "off",        ZFS_CANMOUNT_OFF },
                { "on",         ZFS_CANMOUNT_ON },
@@ -157,160 +178,208 @@ zfs_prop_init(void)
                { NULL }
        };
 
+       static zprop_index_t sync_table[] = {
+               { "standard",   ZFS_SYNC_STANDARD },
+               { "always",     ZFS_SYNC_ALWAYS },
+               { "disabled",   ZFS_SYNC_DISABLED },
+               { NULL }
+       };
+
        /* inherit index properties */
-       register_index(ZFS_PROP_CHECKSUM, "checksum", ZIO_CHECKSUM_DEFAULT,
+       zprop_register_index(ZFS_PROP_SYNC, "sync", ZFS_SYNC_STANDARD,
            PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
+           "standard | always | disabled", "SYNC",
+           sync_table);
+       zprop_register_index(ZFS_PROP_CHECKSUM, "checksum",
+           ZIO_CHECKSUM_DEFAULT, PROP_INHERIT, ZFS_TYPE_FILESYSTEM |
+           ZFS_TYPE_VOLUME,
            "on | off | fletcher2 | fletcher4 | sha256", "CHECKSUM",
            checksum_table);
-       register_index(ZFS_PROP_COMPRESSION, "compression",
+       zprop_register_index(ZFS_PROP_DEDUP, "dedup", ZIO_CHECKSUM_OFF,
+           PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
+           "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]", "COMPRESS", compress_table);
-       register_index(ZFS_PROP_SNAPDIR, "snapdir", ZFS_SNAPDIR_HIDDEN,
+           "on | off | lzjb | gzip | gzip-[1-9] | zle", "COMPRESS",
+           compress_table);
+       zprop_register_index(ZFS_PROP_SNAPDIR, "snapdir", ZFS_SNAPDIR_HIDDEN,
            PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
            "hidden | visible", "SNAPDIR", snapdir_table);
-       register_index(ZFS_PROP_ACLMODE, "aclmode", ZFS_ACL_GROUPMASK,
-           PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
-           "discard | groupmask | passthrough", "ACLMODE", acl_mode_table);
-       register_index(ZFS_PROP_ACLINHERIT, "aclinherit", ZFS_ACL_RESTRICTED,
-           PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
+       zprop_register_index(ZFS_PROP_ACLINHERIT, "aclinherit",
+           ZFS_ACL_RESTRICTED, PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
            "discard | noallow | restricted | passthrough | passthrough-x",
            "ACLINHERIT", acl_inherit_table);
-       register_index(ZFS_PROP_COPIES, "copies", 1,
-           PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
+       zprop_register_index(ZFS_PROP_COPIES, "copies", 1, PROP_INHERIT,
+           ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
            "1 | 2 | 3", "COPIES", copies_table);
-       register_index(ZFS_PROP_PRIMARYCACHE, "primarycache",
+       zprop_register_index(ZFS_PROP_PRIMARYCACHE, "primarycache",
            ZFS_CACHE_ALL, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT | ZFS_TYPE_VOLUME,
            "all | none | metadata", "PRIMARYCACHE", cache_table);
-       register_index(ZFS_PROP_SECONDARYCACHE, "secondarycache",
+       zprop_register_index(ZFS_PROP_SECONDARYCACHE, "secondarycache",
            ZFS_CACHE_ALL, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT | ZFS_TYPE_VOLUME,
            "all | none | metadata", "SECONDARYCACHE", cache_table);
+       zprop_register_index(ZFS_PROP_LOGBIAS, "logbias", ZFS_LOGBIAS_LATENCY,
+           PROP_INHERIT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
+           "latency | throughput", "LOGBIAS", logbias_table);
 
        /* inherit index (boolean) properties */
-       register_index(ZFS_PROP_ATIME, "atime", 1, PROP_INHERIT,
+       zprop_register_index(ZFS_PROP_ATIME, "atime", 1, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM, "on | off", "ATIME", boolean_table);
-       register_index(ZFS_PROP_DEVICES, "devices", 1, PROP_INHERIT,
+       zprop_register_index(ZFS_PROP_DEVICES, "devices", 1, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT, "on | off", "DEVICES",
            boolean_table);
-       register_index(ZFS_PROP_EXEC, "exec", 1, PROP_INHERIT,
+       zprop_register_index(ZFS_PROP_EXEC, "exec", 1, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT, "on | off", "EXEC",
            boolean_table);
-       register_index(ZFS_PROP_SETUID, "setuid", 1, PROP_INHERIT,
+       zprop_register_index(ZFS_PROP_SETUID, "setuid", 1, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT, "on | off", "SETUID",
            boolean_table);
-       register_index(ZFS_PROP_READONLY, "readonly", 0, PROP_INHERIT,
+       zprop_register_index(ZFS_PROP_READONLY, "readonly", 0, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "on | off", "RDONLY",
            boolean_table);
-       register_index(ZFS_PROP_ZONED, "zoned", 0, PROP_INHERIT,
+       zprop_register_index(ZFS_PROP_ZONED, "zoned", 0, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM, "on | off", "ZONED", boolean_table);
-       register_index(ZFS_PROP_XATTR, "xattr", 1, PROP_INHERIT,
+       zprop_register_index(ZFS_PROP_XATTR, "xattr", 1, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT, "on | off", "XATTR",
            boolean_table);
-       register_index(ZFS_PROP_VSCAN, "vscan", 0, PROP_INHERIT,
+       zprop_register_index(ZFS_PROP_VSCAN, "vscan", 0, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM, "on | off", "VSCAN",
            boolean_table);
-       register_index(ZFS_PROP_NBMAND, "nbmand", 0, PROP_INHERIT,
+       zprop_register_index(ZFS_PROP_NBMAND, "nbmand", 0, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT, "on | off", "NBMAND",
            boolean_table);
 
        /* default index properties */
-       register_index(ZFS_PROP_VERSION, "version", 0, PROP_DEFAULT,
+       zprop_register_index(ZFS_PROP_VERSION, "version", 0, PROP_DEFAULT,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT,
-           "1 | 2 | 3 | current", "VERSION", version_table);
-       register_index(ZFS_PROP_CANMOUNT, "canmount", ZFS_CANMOUNT_ON,
+           "1 | 2 | 3 | 4 | current", "VERSION", version_table);
+       zprop_register_index(ZFS_PROP_CANMOUNT, "canmount", ZFS_CANMOUNT_ON,
            PROP_DEFAULT, ZFS_TYPE_FILESYSTEM, "on | off | noauto",
            "CANMOUNT", canmount_table);
 
        /* readonly index (boolean) properties */
-       register_index(ZFS_PROP_MOUNTED, "mounted", 0, PROP_READONLY,
+       zprop_register_index(ZFS_PROP_MOUNTED, "mounted", 0, PROP_READONLY,
            ZFS_TYPE_FILESYSTEM, "yes | no", "MOUNTED", boolean_table);
+       zprop_register_index(ZFS_PROP_DEFER_DESTROY, "defer_destroy", 0,
+           PROP_READONLY, ZFS_TYPE_SNAPSHOT, "yes | no", "DEFER_DESTROY",
+           boolean_table);
 
        /* set once index properties */
-       register_index(ZFS_PROP_NORMALIZE, "normalization", 0,
+       zprop_register_index(ZFS_PROP_NORMALIZE, "normalization", 0,
            PROP_ONETIME, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT,
            "none | formC | formD | formKC | formKD", "NORMALIZATION",
            normalize_table);
-       register_index(ZFS_PROP_CASE, "casesensitivity", ZFS_CASE_SENSITIVE,
-           PROP_ONETIME, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT,
+       zprop_register_index(ZFS_PROP_CASE, "casesensitivity",
+           ZFS_CASE_SENSITIVE, PROP_ONETIME, ZFS_TYPE_FILESYSTEM |
+           ZFS_TYPE_SNAPSHOT,
            "sensitive | insensitive | mixed", "CASE", case_table);
 
        /* set once index (boolean) properties */
-       register_index(ZFS_PROP_UTF8ONLY, "utf8only", 0, PROP_ONETIME,
+       zprop_register_index(ZFS_PROP_UTF8ONLY, "utf8only", 0, PROP_ONETIME,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_SNAPSHOT,
            "on | off", "UTF8ONLY", boolean_table);
 
        /* string properties */
-       register_string(ZFS_PROP_ORIGIN, "origin", NULL, PROP_READONLY,
+       zprop_register_string(ZFS_PROP_ORIGIN, "origin", NULL, PROP_READONLY,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<snapshot>", "ORIGIN");
-       register_string(ZFS_PROP_MOUNTPOINT, "mountpoint", "/", PROP_INHERIT,
-           ZFS_TYPE_FILESYSTEM, "<path> | legacy | none", "MOUNTPOINT");
-       register_string(ZFS_PROP_SHARENFS, "sharenfs", "off", PROP_INHERIT,
-           ZFS_TYPE_FILESYSTEM, "on | off | share(1M) options", "SHARENFS");
-       register_string(ZFS_PROP_SHAREISCSI, "shareiscsi", "off", PROP_INHERIT,
-           ZFS_TYPE_DATASET, "on | off | type=<type>", "SHAREISCSI");
-       register_string(ZFS_PROP_TYPE, "type", NULL, PROP_READONLY,
+       zprop_register_string(ZFS_PROP_MOUNTPOINT, "mountpoint", "/",
+           PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "<path> | legacy | none",
+           "MOUNTPOINT");
+       zprop_register_string(ZFS_PROP_SHARENFS, "sharenfs", "off",
+           PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "on | off | share(1M) options",
+           "SHARENFS");
+       zprop_register_string(ZFS_PROP_TYPE, "type", NULL, PROP_READONLY,
            ZFS_TYPE_DATASET, "filesystem | volume | snapshot", "TYPE");
-       register_string(ZFS_PROP_SHARESMB, "sharesmb", "off", PROP_INHERIT,
-           ZFS_TYPE_FILESYSTEM, "on | off | sharemgr(1M) options", "SHARESMB");
+       zprop_register_string(ZFS_PROP_SHARESMB, "sharesmb", "off",
+           PROP_INHERIT, ZFS_TYPE_FILESYSTEM,
+           "on | off | sharemgr(1M) options", "SHARESMB");
+       zprop_register_string(ZFS_PROP_MLSLABEL, "mlslabel",
+           ZFS_MLSLABEL_DEFAULT, PROP_INHERIT, ZFS_TYPE_DATASET,
+           "<sensitivity label>", "MLSLABEL");
 
        /* readonly number properties */
-       register_number(ZFS_PROP_USED, "used", 0, PROP_READONLY,
+       zprop_register_number(ZFS_PROP_USED, "used", 0, PROP_READONLY,
            ZFS_TYPE_DATASET, "<size>", "USED");
-       register_number(ZFS_PROP_AVAILABLE, "available", 0, PROP_READONLY,
+       zprop_register_number(ZFS_PROP_AVAILABLE, "available", 0, PROP_READONLY,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<size>", "AVAIL");
-       register_number(ZFS_PROP_REFERENCED, "referenced", 0, PROP_READONLY,
-           ZFS_TYPE_DATASET, "<size>", "REFER");
-       register_number(ZFS_PROP_COMPRESSRATIO, "compressratio", 0,
+       zprop_register_number(ZFS_PROP_REFERENCED, "referenced", 0,
+           PROP_READONLY, ZFS_TYPE_DATASET, "<size>", "REFER");
+       zprop_register_number(ZFS_PROP_COMPRESSRATIO, "compressratio", 0,
            PROP_READONLY, ZFS_TYPE_DATASET,
            "<1.00x or higher if compressed>", "RATIO");
-       register_number(ZFS_PROP_VOLBLOCKSIZE, "volblocksize", 8192,
-           PROP_ONETIME,
+       zprop_register_number(ZFS_PROP_VOLBLOCKSIZE, "volblocksize",
+           ZVOL_DEFAULT_BLOCKSIZE, PROP_ONETIME,
            ZFS_TYPE_VOLUME, "512 to 128k, power of 2", "VOLBLOCK");
-       register_number(ZFS_PROP_USEDSNAP, "usedbysnapshots", 0, PROP_READONLY,
-           ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<size>", "USEDSNAP");
-       register_number(ZFS_PROP_USEDDS, "usedbydataset", 0, PROP_READONLY,
-           ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<size>", "USEDDS");
-       register_number(ZFS_PROP_USEDCHILD, "usedbychildren", 0, PROP_READONLY,
-           ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<size>", "USEDCHILD");
-       register_number(ZFS_PROP_USEDREFRESERV, "usedbyrefreservation", 0,
+       zprop_register_number(ZFS_PROP_USEDSNAP, "usedbysnapshots", 0,
+           PROP_READONLY, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<size>",
+           "USEDSNAP");
+       zprop_register_number(ZFS_PROP_USEDDS, "usedbydataset", 0,
+           PROP_READONLY, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<size>",
+           "USEDDS");
+       zprop_register_number(ZFS_PROP_USEDCHILD, "usedbychildren", 0,
+           PROP_READONLY, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<size>",
+           "USEDCHILD");
+       zprop_register_number(ZFS_PROP_USEDREFRESERV, "usedbyrefreservation", 0,
            PROP_READONLY,
            ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<size>", "USEDREFRESERV");
+       zprop_register_number(ZFS_PROP_USERREFS, "userrefs", 0, PROP_READONLY,
+           ZFS_TYPE_SNAPSHOT, "<count>", "USERREFS");
 
        /* default number properties */
-       register_number(ZFS_PROP_QUOTA, "quota", 0, PROP_DEFAULT,
+       zprop_register_number(ZFS_PROP_QUOTA, "quota", 0, PROP_DEFAULT,
            ZFS_TYPE_FILESYSTEM, "<size> | none", "QUOTA");
-       register_number(ZFS_PROP_RESERVATION, "reservation", 0, PROP_DEFAULT,
-           ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<size> | none", "RESERV");
-       register_number(ZFS_PROP_VOLSIZE, "volsize", 0, PROP_DEFAULT,
+       zprop_register_number(ZFS_PROP_RESERVATION, "reservation", 0,
+           PROP_DEFAULT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
+           "<size> | none", "RESERV");
+       zprop_register_number(ZFS_PROP_VOLSIZE, "volsize", 0, PROP_DEFAULT,
            ZFS_TYPE_VOLUME, "<size>", "VOLSIZE");
-       register_number(ZFS_PROP_REFQUOTA, "refquota", 0, PROP_DEFAULT,
+       zprop_register_number(ZFS_PROP_REFQUOTA, "refquota", 0, PROP_DEFAULT,
            ZFS_TYPE_FILESYSTEM, "<size> | none", "REFQUOTA");
-       register_number(ZFS_PROP_REFRESERVATION, "refreservation", 0,
+       zprop_register_number(ZFS_PROP_REFRESERVATION, "refreservation", 0,
            PROP_DEFAULT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
            "<size> | none", "REFRESERV");
 
        /* inherit number properties */
-       register_number(ZFS_PROP_RECORDSIZE, "recordsize", SPA_MAXBLOCKSIZE,
-           PROP_INHERIT,
+       zprop_register_number(ZFS_PROP_RECORDSIZE, "recordsize",
+           SPA_MAXBLOCKSIZE, PROP_INHERIT,
            ZFS_TYPE_FILESYSTEM, "512 to 128k, power of 2", "RECSIZE");
 
        /* hidden properties */
-       register_hidden(ZFS_PROP_CREATETXG, "createtxg", PROP_TYPE_NUMBER,
-           PROP_READONLY, ZFS_TYPE_DATASET, NULL);
-       register_hidden(ZFS_PROP_NUMCLONES, "numclones", PROP_TYPE_NUMBER,
-           PROP_READONLY, ZFS_TYPE_SNAPSHOT, NULL);
-       register_hidden(ZFS_PROP_NAME, "name", PROP_TYPE_STRING,
+       zprop_register_hidden(ZFS_PROP_CREATETXG, "createtxg", PROP_TYPE_NUMBER,
+           PROP_READONLY, ZFS_TYPE_DATASET, "CREATETXG");
+       zprop_register_hidden(ZFS_PROP_NUMCLONES, "numclones", PROP_TYPE_NUMBER,
+           PROP_READONLY, ZFS_TYPE_SNAPSHOT, "NUMCLONES");
+       zprop_register_hidden(ZFS_PROP_NAME, "name", PROP_TYPE_STRING,
            PROP_READONLY, ZFS_TYPE_DATASET, "NAME");
-       register_hidden(ZFS_PROP_ISCSIOPTIONS, "iscsioptions", PROP_TYPE_STRING,
-           PROP_INHERIT, ZFS_TYPE_VOLUME, "ISCSIOPTIONS");
-       register_hidden(ZFS_PROP_GUID, "guid", PROP_TYPE_NUMBER, PROP_READONLY,
-           ZFS_TYPE_DATASET, "GUID");
+       zprop_register_hidden(ZFS_PROP_ISCSIOPTIONS, "iscsioptions",
+           PROP_TYPE_STRING, PROP_INHERIT, ZFS_TYPE_VOLUME, "ISCSIOPTIONS");
+       zprop_register_hidden(ZFS_PROP_STMF_SHAREINFO, "stmf_sbd_lu",
+           PROP_TYPE_STRING, PROP_INHERIT, ZFS_TYPE_VOLUME,
+           "STMF_SBD_LU");
+       zprop_register_hidden(ZFS_PROP_GUID, "guid", PROP_TYPE_NUMBER,
+           PROP_READONLY, ZFS_TYPE_DATASET, "GUID");
+       zprop_register_hidden(ZFS_PROP_USERACCOUNTING, "useraccounting",
+           PROP_TYPE_NUMBER, PROP_READONLY, ZFS_TYPE_DATASET,
+           "USERACCOUNTING");
+       zprop_register_hidden(ZFS_PROP_UNIQUE, "unique", PROP_TYPE_NUMBER,
+           PROP_READONLY, ZFS_TYPE_DATASET, "UNIQUE");
+       zprop_register_hidden(ZFS_PROP_OBJSETID, "objsetid", PROP_TYPE_NUMBER,
+           PROP_READONLY, ZFS_TYPE_DATASET, "OBJSETID");
+
+       /*
+        * Property to be removed once libbe is integrated
+        */
+       zprop_register_hidden(ZFS_PROP_PRIVATE, "priv_prop",
+           PROP_TYPE_NUMBER, PROP_READONLY, ZFS_TYPE_FILESYSTEM,
+           "PRIV_PROP");
 
        /* oddball properties */
-       register_impl(ZFS_PROP_CREATION, "creation", PROP_TYPE_NUMBER, 0, NULL,
-           PROP_READONLY, ZFS_TYPE_DATASET,
+       zprop_register_impl(ZFS_PROP_CREATION, "creation", PROP_TYPE_NUMBER, 0,
+           NULL, PROP_READONLY, ZFS_TYPE_DATASET,
            "<date>", "CREATION", B_FALSE, B_TRUE, NULL);
 }
 
@@ -318,6 +387,11 @@ boolean_t
 zfs_prop_delegatable(zfs_prop_t prop)
 {
        zprop_desc_t *pd = &zfs_prop_table[prop];
+
+       /* The mlslabel property is never delegatable. */
+       if (prop == ZFS_PROP_MLSLABEL)
+               return (B_FALSE);
+
        return (pd->pd_attr != PROP_READONLY);
 }
 
@@ -330,7 +404,6 @@ zfs_name_to_prop(const char *propname)
        return (zprop_name_to_prop(propname, ZFS_TYPE_DATASET));
 }
 
-
 /*
  * For user property names, we allow all lowercase alphanumeric characters, plus
  * a few useful punctuation characters.
@@ -368,6 +441,26 @@ zfs_prop_user(const char *name)
 }
 
 /*
+ * Returns true if this is a valid userspace-type property (one with a '@').
+ * Note that after the @, any character is valid (eg, another @, for SID
+ * user@domain).
+ */
+boolean_t
+zfs_prop_userquota(const char *name)
+{
+       zfs_userquota_prop_t prop;
+
+       for (prop = 0; prop < ZFS_NUM_USERQUOTA_PROPS; prop++) {
+               if (strncmp(name, zfs_userquota_prop_prefixes[prop],
+                   strlen(zfs_userquota_prop_prefixes[prop])) == 0) {
+                       return (B_TRUE);
+               }
+       }
+
+       return (B_FALSE);
+}
+
+/*
  * Tables of index types, plus functions to convert between the user view
  * (strings) and internal representation (uint64_t).
  */
@@ -383,6 +476,12 @@ zfs_prop_index_to_string(zfs_prop_t prop, uint64_t index, const char **string)
        return (zprop_index_to_string(prop, index, string, ZFS_TYPE_DATASET));
 }
 
+uint64_t
+zfs_prop_random_value(zfs_prop_t prop, uint64_t seed)
+{
+       return (zprop_random_value(prop, seed, ZFS_TYPE_DATASET));
+}
+
 /*
  * Returns TRUE if the property applies to any of the given dataset types.
  */