]> git.proxmox.com Git - mirror_zfs.git/blobdiff - cmd/zfs/zfs_main.c
OpenZFS 6550 - cmd/zfs: cleanup gcc warnings
[mirror_zfs.git] / cmd / zfs / zfs_main.c
index f21c36b815f3b4d351fa6096112b2f76a2f935ff..3b72d60f2284cb66c6425f6d9c287d5990ab7584 100644 (file)
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
+ * Copyright 2012 Milan Jurik. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2013 Steven Hartland.  All rights reserved.
+ * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>.
  */
 
 #include <assert.h>
@@ -41,6 +47,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <signal.h>
+#include <sys/list.h>
 #include <sys/mkdev.h>
 #include <sys/mntent.h>
 #include <sys/mnttab.h>
 #include <time.h>
 
 #include <libzfs.h>
+#include <libzfs_core.h>
+#include <zfs_prop.h>
+#include <zfs_deleg.h>
 #include <libuutil.h>
+#ifdef HAVE_IDMAP
+#include <aclutils.h>
+#include <directory.h>
+#endif /* HAVE_IDMAP */
 
 #include "zfs_iter.h"
 #include "zfs_util.h"
 #include "zfs_comutil.h"
+#include "libzfs_impl.h"
 
 libzfs_handle_t *g_zfs;
 
 static FILE *mnttab_file;
 static char history_str[HIS_MAX_RECORD_LEN];
-const char *pypath = "/usr/lib/zfs/pyzfs.py";
+static boolean_t log_history = B_TRUE;
 
 static int zfs_do_clone(int argc, char **argv);
 static int zfs_do_create(int argc, char **argv);
@@ -82,10 +97,13 @@ static int zfs_do_send(int argc, char **argv);
 static int zfs_do_receive(int argc, char **argv);
 static int zfs_do_promote(int argc, char **argv);
 static int zfs_do_userspace(int argc, char **argv);
-static int zfs_do_python(int argc, char **argv);
+static int zfs_do_allow(int argc, char **argv);
+static int zfs_do_unallow(int argc, char **argv);
 static int zfs_do_hold(int argc, char **argv);
+static int zfs_do_holds(int argc, char **argv);
 static int zfs_do_release(int argc, char **argv);
 static int zfs_do_diff(int argc, char **argv);
+static int zfs_do_bookmark(int argc, char **argv);
 
 /*
  * Enable a reasonable set of defaults for libumem debugging on DEBUG builds.
@@ -131,7 +149,8 @@ typedef enum {
        HELP_HOLD,
        HELP_HOLDS,
        HELP_RELEASE,
-       HELP_DIFF
+       HELP_DIFF,
+       HELP_BOOKMARK,
 } zfs_help_t;
 
 typedef struct zfs_command {
@@ -158,6 +177,7 @@ static zfs_command_t command_table[] = {
        { "clone",      zfs_do_clone,           HELP_CLONE              },
        { "promote",    zfs_do_promote,         HELP_PROMOTE            },
        { "rename",     zfs_do_rename,          HELP_RENAME             },
+       { "bookmark",   zfs_do_bookmark,        HELP_BOOKMARK           },
        { NULL },
        { "list",       zfs_do_list,            HELP_LIST               },
        { NULL },
@@ -176,12 +196,12 @@ static zfs_command_t command_table[] = {
        { "send",       zfs_do_send,            HELP_SEND               },
        { "receive",    zfs_do_receive,         HELP_RECEIVE            },
        { NULL },
-       { "allow",      zfs_do_python,          HELP_ALLOW              },
+       { "allow",      zfs_do_allow,           HELP_ALLOW              },
        { NULL },
-       { "unallow",    zfs_do_python,          HELP_UNALLOW            },
+       { "unallow",    zfs_do_unallow,         HELP_UNALLOW            },
        { NULL },
        { "hold",       zfs_do_hold,            HELP_HOLD               },
-       { "holds",      zfs_do_python,          HELP_HOLDS              },
+       { "holds",      zfs_do_holds,           HELP_HOLDS              },
        { "release",    zfs_do_release,         HELP_RELEASE            },
        { "diff",       zfs_do_diff,            HELP_DIFF               },
 };
@@ -203,11 +223,14 @@ get_usage(zfs_help_t idx)
                    "\tcreate [-ps] [-b blocksize] [-o property=value] ... "
                    "-V <size> <volume>\n"));
        case HELP_DESTROY:
-               return (gettext("\tdestroy [-rRf] <filesystem|volume>\n"
-                   "\tdestroy [-rRd] <snapshot>\n"));
+               return (gettext("\tdestroy [-fnpRrv] <filesystem|volume>\n"
+                   "\tdestroy [-dnpRrv] "
+                   "<filesystem|volume>@<snap>[%<snap>][,...]\n"
+                   "\tdestroy <filesystem|volume>#<bookmark>\n"));
        case HELP_GET:
                return (gettext("\tget [-rHp] [-d max] "
-                   "[-o \"all\" | field[,...]] [-s source[,...]]\n"
+                   "[-o \"all\" | field[,...]]\n"
+                   "\t    [-t type[,...]] [-s source[,...]]\n"
                    "\t    <\"all\" | property[,...]> "
                    "[filesystem|volume|snapshot] ...\n"));
        case HELP_INHERIT:
@@ -217,9 +240,8 @@ get_usage(zfs_help_t idx)
                return (gettext("\tupgrade [-v]\n"
                    "\tupgrade [-r] [-V version] <-a | filesystem ...>\n"));
        case HELP_LIST:
-               return (gettext("\tlist [-rH][-d max] "
-                   "[-o property[,...]] [-t type[,...]] [-s property] ...\n"
-                   "\t    [-S property] ... "
+               return (gettext("\tlist [-Hp] [-r|-d max] [-o property[,...]] "
+                   "[-s property]...\n\t    [-S property]... [-t type[,...]] "
                    "[filesystem|volume|snapshot] ...\n"));
        case HELP_MOUNT:
                return (gettext("\tmount\n"
@@ -227,32 +249,38 @@ get_usage(zfs_help_t idx)
        case HELP_PROMOTE:
                return (gettext("\tpromote <clone-filesystem>\n"));
        case HELP_RECEIVE:
-               return (gettext("\treceive [-vnFu] <filesystem|volume|"
-               "snapshot>\n"
-               "\treceive [-vnFu] [-d | -e] <filesystem>\n"));
+               return (gettext("\treceive [-vnsFu] <filesystem|volume|"
+                   "snapshot>\n"
+                   "\treceive [-vnsFu] [-o origin=<snapshot>] [-d | -e] "
+                   "<filesystem>\n"
+                   "\treceive -A <filesystem|volume>\n"));
        case HELP_RENAME:
-               return (gettext("\trename <filesystem|volume|snapshot> "
+               return (gettext("\trename [-f] <filesystem|volume|snapshot> "
                    "<filesystem|volume|snapshot>\n"
-                   "\trename -p <filesystem|volume> <filesystem|volume>\n"
-                   "\trename -r <snapshot> <snapshot>"));
+                   "\trename [-f] -p <filesystem|volume> <filesystem|volume>\n"
+                   "\trename -r <snapshot> <snapshot>\n"));
        case HELP_ROLLBACK:
                return (gettext("\trollback [-rRf] <snapshot>\n"));
        case HELP_SEND:
-               return (gettext("\tsend [-RDp] [-[iI] snapshot] <snapshot>\n"));
+               return (gettext("\tsend [-DnPpRvLec] [-[iI] snapshot] "
+                   "<snapshot>\n"
+                   "\tsend [-Le] [-i snapshot|bookmark] "
+                   "<filesystem|volume|snapshot>\n"
+                   "\tsend [-nvPe] -t <receive_resume_token>\n"));
        case HELP_SET:
-               return (gettext("\tset <property=value> "
+               return (gettext("\tset <property=value> ... "
                    "<filesystem|volume|snapshot> ...\n"));
        case HELP_SHARE:
-               return (gettext("\tshare <-a | filesystem>\n"));
+               return (gettext("\tshare <-a [nfs|smb] | filesystem>\n"));
        case HELP_SNAPSHOT:
-               return (gettext("\tsnapshot [-r] [-o property=value] ... "
-                   "<filesystem@snapname|volume@snapname>\n"));
+               return (gettext("\tsnapshot|snap [-r] [-o property=value] ... "
+                   "<filesystem|volume>@<snap> ...\n"));
        case HELP_UNMOUNT:
                return (gettext("\tunmount [-f] "
                    "<-a | filesystem|mountpoint>\n"));
        case HELP_UNSHARE:
                return (gettext("\tunshare "
-                   "<-a | filesystem|mountpoint>\n"));
+                   "<-a [nfs|smb] | filesystem|mountpoint>\n"));
        case HELP_ALLOW:
                return (gettext("\tallow <filesystem|volume>\n"
                    "\tallow [-ldug] "
@@ -274,13 +302,15 @@ get_usage(zfs_help_t idx)
                    "\tunallow [-r] -s @setname [<perm|@setname>[,...]] "
                    "<filesystem|volume>\n"));
        case HELP_USERSPACE:
-               return (gettext("\tuserspace [-hniHp] [-o field[,...]] "
-                   "[-sS field] ... [-t type[,...]]\n"
-                   "\t    <filesystem|snapshot>\n"));
+               return (gettext("\tuserspace [-Hinp] [-o field[,...]] "
+                   "[-s field] ...\n"
+                   "\t    [-S field] ... [-t type[,...]] "
+                   "<filesystem|snapshot>\n"));
        case HELP_GROUPSPACE:
-               return (gettext("\tgroupspace [-hniHpU] [-o field[,...]] "
-                   "[-sS field] ... [-t type[,...]]\n"
-                   "\t    <filesystem|snapshot>\n"));
+               return (gettext("\tgroupspace [-Hinp] [-o field[,...]] "
+                   "[-s field] ...\n"
+                   "\t    [-S field] ... [-t type[,...]] "
+                   "<filesystem|snapshot>\n"));
        case HELP_HOLD:
                return (gettext("\thold [-r] <tag> <snapshot> ...\n"));
        case HELP_HOLDS:
@@ -290,6 +320,8 @@ get_usage(zfs_help_t idx)
        case HELP_DIFF:
                return (gettext("\tdiff [-FHt] <snapshot> "
                    "[snapshot|filesystem]\n"));
+       case HELP_BOOKMARK:
+               return (gettext("\tbookmark <snapshot> <bookmark>\n"));
        }
 
        abort();
@@ -417,6 +449,8 @@ usage(boolean_t requested)
                (void) fprintf(fp, "YES       NO   <size> | none\n");
                (void) fprintf(fp, "\t%-15s ", "groupquota@...");
                (void) fprintf(fp, "YES       NO   <size> | none\n");
+               (void) fprintf(fp, "\t%-15s ", "written@<snap>");
+               (void) fprintf(fp, " NO       NO   <size>\n");
 
                (void) fprintf(fp, gettext("\nSizes are specified in bytes "
                    "with standard units such as K, M, G, etc.\n"));
@@ -449,15 +483,18 @@ usage(boolean_t requested)
        exit(requested ? 0 : 2);
 }
 
+/*
+ * Take a property=value argument string and add it to the given nvlist.
+ * Modifies the argument inplace.
+ */
 static int
-parseprop(nvlist_t *props)
+parseprop(nvlist_t *props, char *propname)
 {
-       char *propname = optarg;
        char *propval, *strval;
 
        if ((propval = strchr(propname, '=')) == NULL) {
                (void) fprintf(stderr, gettext("missing "
-                   "'=' for -o option\n"));
+                   "'=' for property=value argument\n"));
                return (-1);
        }
        *propval = '\0';
@@ -547,6 +584,56 @@ finish_progress(char *done)
        pt_header = NULL;
 }
 
+static int
+zfs_mount_and_share(libzfs_handle_t *hdl, const char *dataset, zfs_type_t type)
+{
+       zfs_handle_t *zhp = NULL;
+       int ret = 0;
+
+       zhp = zfs_open(hdl, dataset, type);
+       if (zhp == NULL)
+               return (1);
+
+       /*
+        * Volumes may neither be mounted or shared.  Potentially in the
+        * future filesystems detected on these volumes could be mounted.
+        */
+       if (zfs_get_type(zhp) == ZFS_TYPE_VOLUME) {
+               zfs_close(zhp);
+               return (0);
+       }
+
+       /*
+        * Mount and/or share the new filesystem as appropriate.  We provide a
+        * verbose error message to let the user know that their filesystem was
+        * in fact created, even if we failed to mount or share it.
+        *
+        * If the user doesn't want the dataset automatically mounted, then
+        * skip the mount/share step
+        */
+       if (zfs_prop_valid_for_type(ZFS_PROP_CANMOUNT, type, B_FALSE) &&
+           zfs_prop_get_int(zhp, ZFS_PROP_CANMOUNT) == ZFS_CANMOUNT_ON) {
+               if (geteuid() != 0) {
+                       (void) fprintf(stderr, gettext("filesystem "
+                           "successfully created, but it may only be "
+                           "mounted by root\n"));
+                       ret = 1;
+               } else if (zfs_mount(zhp, NULL, 0) != 0) {
+                       (void) fprintf(stderr, gettext("filesystem "
+                           "successfully created, but not mounted\n"));
+                       ret = 1;
+               } else if (zfs_share(zhp) != 0) {
+                       (void) fprintf(stderr, gettext("filesystem "
+                           "successfully created, but not shared\n"));
+                       ret = 1;
+               }
+       }
+
+       zfs_close(zhp);
+
+       return (ret);
+}
+
 /*
  * zfs clone [-p] [-o prop=value] ... <snap> <fs | vol>
  *
@@ -563,7 +650,7 @@ zfs_do_clone(int argc, char **argv)
        zfs_handle_t *zhp = NULL;
        boolean_t parents = B_FALSE;
        nvlist_t *props;
-       int ret;
+       int ret = 0;
        int c;
 
        if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
@@ -573,8 +660,10 @@ zfs_do_clone(int argc, char **argv)
        while ((c = getopt(argc, argv, "o:p")) != -1) {
                switch (c) {
                case 'o':
-                       if (parseprop(props))
+                       if (parseprop(props, optarg) != 0) {
+                               nvlist_free(props);
                                return (1);
+                       }
                        break;
                case 'p':
                        parents = B_TRUE;
@@ -606,8 +695,10 @@ zfs_do_clone(int argc, char **argv)
        }
 
        /* open the source dataset */
-       if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_SNAPSHOT)) == NULL)
+       if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_SNAPSHOT)) == NULL) {
+               nvlist_free(props);
                return (1);
+       }
 
        if (parents && zfs_name_valid(argv[1], ZFS_TYPE_FILESYSTEM |
            ZFS_TYPE_VOLUME)) {
@@ -617,10 +708,16 @@ zfs_do_clone(int argc, char **argv)
                 * complain.
                 */
                if (zfs_dataset_exists(g_zfs, argv[1], ZFS_TYPE_FILESYSTEM |
-                   ZFS_TYPE_VOLUME))
+                   ZFS_TYPE_VOLUME)) {
+                       zfs_close(zhp);
+                       nvlist_free(props);
                        return (0);
-               if (zfs_create_ancestors(g_zfs, argv[1]) != 0)
+               }
+               if (zfs_create_ancestors(g_zfs, argv[1]) != 0) {
+                       zfs_close(zhp);
+                       nvlist_free(props);
                        return (1);
+               }
        }
 
        /* pass to libzfs */
@@ -628,15 +725,12 @@ zfs_do_clone(int argc, char **argv)
 
        /* create the mountpoint if necessary */
        if (ret == 0) {
-               zfs_handle_t *clone;
-
-               clone = zfs_open(g_zfs, argv[1], ZFS_TYPE_DATASET);
-               if (clone != NULL) {
-                       if (zfs_get_type(clone) != ZFS_TYPE_VOLUME)
-                               if ((ret = zfs_mount(clone, NULL, 0)) == 0)
-                                       ret = zfs_share(clone);
-                       zfs_close(clone);
+               if (log_history) {
+                       (void) zpool_log_history(g_zfs, history_str);
+                       log_history = B_FALSE;
                }
+
+               ret = zfs_mount_and_share(g_zfs, argv[1], ZFS_TYPE_DATASET);
        }
 
        zfs_close(zhp);
@@ -671,7 +765,6 @@ static int
 zfs_do_create(int argc, char **argv)
 {
        zfs_type_t type = ZFS_TYPE_FILESYSTEM;
-       zfs_handle_t *zhp = NULL;
        uint64_t volsize = 0;
        int c;
        boolean_t noreserve = B_FALSE;
@@ -680,7 +773,6 @@ zfs_do_create(int argc, char **argv)
        int ret = 1;
        nvlist_t *props;
        uint64_t intval;
-       int canmount = ZFS_CANMOUNT_OFF;
 
        if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
                nomem();
@@ -720,7 +812,7 @@ zfs_do_create(int argc, char **argv)
                                nomem();
                        break;
                case 'o':
-                       if (parseprop(props))
+                       if (parseprop(props, optarg) != 0)
                                goto error;
                        break;
                case 's':
@@ -730,7 +822,6 @@ zfs_do_create(int argc, char **argv)
                        (void) fprintf(stderr, gettext("missing size "
                            "argument\n"));
                        goto badusage;
-                       break;
                case '?':
                        (void) fprintf(stderr, gettext("invalid option '%c'\n"),
                            optopt);
@@ -760,12 +851,14 @@ zfs_do_create(int argc, char **argv)
 
        if (type == ZFS_TYPE_VOLUME && !noreserve) {
                zpool_handle_t *zpool_handle;
+               nvlist_t *real_props = NULL;
                uint64_t spa_version;
                char *p;
                zfs_prop_t resv_prop;
                char *strval;
+               char msg[1024];
 
-               if ((p = strchr(argv[0], '/')))
+               if ((p = strchr(argv[0], '/')) != NULL)
                        *p = '\0';
                zpool_handle = zpool_open(g_zfs, argv[0]);
                if (p != NULL)
@@ -774,12 +867,22 @@ zfs_do_create(int argc, char **argv)
                        goto error;
                spa_version = zpool_get_prop_int(zpool_handle,
                    ZPOOL_PROP_VERSION, NULL);
-               zpool_close(zpool_handle);
                if (spa_version >= SPA_VERSION_REFRESERVATION)
                        resv_prop = ZFS_PROP_REFRESERVATION;
                else
                        resv_prop = ZFS_PROP_RESERVATION;
-               volsize = zvol_volsize_to_reservation(volsize, props);
+
+               (void) snprintf(msg, sizeof (msg),
+                   gettext("cannot create '%s'"), argv[0]);
+               if (props && (real_props = zfs_valid_proplist(g_zfs, type,
+                   props, 0, NULL, zpool_handle, msg)) == NULL) {
+                       zpool_close(zpool_handle);
+                       goto error;
+               }
+               zpool_close(zpool_handle);
+
+               volsize = zvol_volsize_to_reservation(volsize, real_props);
+               nvlist_free(real_props);
 
                if (nvlist_lookup_string(props, zfs_prop_to_name(resv_prop),
                    &strval) != 0) {
@@ -809,37 +912,13 @@ zfs_do_create(int argc, char **argv)
        if (zfs_create(g_zfs, argv[0], type, props) != 0)
                goto error;
 
-       if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_DATASET)) == NULL)
-               goto error;
-
-       ret = 0;
-       /*
-        * if the user doesn't want the dataset automatically mounted,
-        * then skip the mount/share step
-        */
-       if (zfs_prop_valid_for_type(ZFS_PROP_CANMOUNT, type))
-               canmount = zfs_prop_get_int(zhp, ZFS_PROP_CANMOUNT);
-
-       /*
-        * Mount and/or share the new filesystem as appropriate.  We provide a
-        * verbose error message to let the user know that their filesystem was
-        * in fact created, even if we failed to mount or share it.
-        */
-       if (canmount == ZFS_CANMOUNT_ON) {
-               if (zfs_mount(zhp, NULL, 0) != 0) {
-                       (void) fprintf(stderr, gettext("filesystem "
-                           "successfully created, but not mounted\n"));
-                       ret = 1;
-               } else if (zfs_share(zhp) != 0) {
-                       (void) fprintf(stderr, gettext("filesystem "
-                           "successfully created, but not shared\n"));
-                       ret = 1;
-               }
+       if (log_history) {
+               (void) zpool_log_history(g_zfs, history_str);
+               log_history = B_FALSE;
        }
 
+       ret = zfs_mount_and_share(g_zfs, argv[0], ZFS_TYPE_DATASET);
 error:
-       if (zhp)
-               zfs_close(zhp);
        nvlist_free(props);
        return (ret);
 badusage:
@@ -863,15 +942,25 @@ badusage:
  */
 typedef struct destroy_cbdata {
        boolean_t       cb_first;
-       int             cb_force;
-       int             cb_recurse;
-       int             cb_error;
-       int             cb_needforce;
-       int             cb_doclones;
-       boolean_t       cb_closezhp;
+       boolean_t       cb_force;
+       boolean_t       cb_recurse;
+       boolean_t       cb_error;
+       boolean_t       cb_doclones;
        zfs_handle_t    *cb_target;
-       char            *cb_snapname;
        boolean_t       cb_defer_destroy;
+       boolean_t       cb_verbose;
+       boolean_t       cb_parsable;
+       boolean_t       cb_dryrun;
+       nvlist_t        *cb_nvl;
+       nvlist_t        *cb_batchedsnaps;
+
+       /* first snap in contiguous run */
+       char            *cb_firstsnap;
+       /* previous snap in contiguous run */
+       char            *cb_prevsnap;
+       int64_t         cb_snapused;
+       char            *cb_snapspec;
+       char            *cb_bookmark;
 } destroy_cbdata_t;
 
 /*
@@ -901,7 +990,7 @@ destroy_check_dependent(zfs_handle_t *zhp, void *data)
                        (void) fprintf(stderr, gettext("use '-r' to destroy "
                            "the following datasets:\n"));
                        cbp->cb_first = B_FALSE;
-                       cbp->cb_error = 1;
+                       cbp->cb_error = B_TRUE;
                }
 
                (void) fprintf(stderr, "%s\n", zfs_get_name(zhp));
@@ -922,7 +1011,8 @@ destroy_check_dependent(zfs_handle_t *zhp, void *data)
                        (void) fprintf(stderr, gettext("use '-R' to destroy "
                            "the following datasets:\n"));
                        cbp->cb_first = B_FALSE;
-                       cbp->cb_error = 1;
+                       cbp->cb_error = B_TRUE;
+                       cbp->cb_dryrun = B_TRUE;
                }
 
                (void) fprintf(stderr, "%s\n", zfs_get_name(zhp));
@@ -936,7 +1026,20 @@ out:
 static int
 destroy_callback(zfs_handle_t *zhp, void *data)
 {
-       destroy_cbdata_t *cbp = data;
+       destroy_cbdata_t *cb = data;
+       const char *name = zfs_get_name(zhp);
+
+       if (cb->cb_verbose) {
+               if (cb->cb_parsable) {
+                       (void) printf("destroy\t%s\n", name);
+               } else if (cb->cb_dryrun) {
+                       (void) printf(gettext("would destroy %s\n"),
+                           name);
+               } else {
+                       (void) printf(gettext("will destroy %s\n"),
+                           name);
+               }
+       }
 
        /*
         * Ignore pools (which we've already flagged as an error before getting
@@ -947,14 +1050,31 @@ destroy_callback(zfs_handle_t *zhp, void *data)
                zfs_close(zhp);
                return (0);
        }
+       if (cb->cb_dryrun) {
+               zfs_close(zhp);
+               return (0);
+       }
 
        /*
-        * Bail out on the first error.
+        * We batch up all contiguous snapshots (even of different
+        * filesystems) and destroy them with one ioctl.  We can't
+        * simply do all snap deletions and then all fs deletions,
+        * because we must delete a clone before its origin.
         */
-       if (zfs_unmount(zhp, NULL, cbp->cb_force ? MS_FORCE : 0) != 0 ||
-           zfs_destroy(zhp, cbp->cb_defer_destroy) != 0) {
-               zfs_close(zhp);
-               return (-1);
+       if (zfs_get_type(zhp) == ZFS_TYPE_SNAPSHOT) {
+               fnvlist_add_boolean(cb->cb_batchedsnaps, name);
+       } else {
+               int error = zfs_destroy_snaps_nvl(g_zfs,
+                   cb->cb_batchedsnaps, B_FALSE);
+               fnvlist_free(cb->cb_batchedsnaps);
+               cb->cb_batchedsnaps = fnvlist_alloc();
+
+               if (error != 0 ||
+                   zfs_unmount(zhp, NULL, cb->cb_force ? MS_FORCE : 0) != 0 ||
+                   zfs_destroy(zhp, cb->cb_defer_destroy) != 0) {
+                       zfs_close(zhp);
+                       return (-1);
+               }
        }
 
        zfs_close(zhp);
@@ -962,66 +1082,183 @@ destroy_callback(zfs_handle_t *zhp, void *data)
 }
 
 static int
-destroy_snap_clones(zfs_handle_t *zhp, void *arg)
+destroy_print_cb(zfs_handle_t *zhp, void *arg)
 {
-       destroy_cbdata_t *cbp = arg;
-       char thissnap[MAXPATHLEN];
-       zfs_handle_t *szhp;
-       boolean_t closezhp = cbp->cb_closezhp;
-       int rv;
-
-       (void) snprintf(thissnap, sizeof (thissnap),
-           "%s@%s", zfs_get_name(zhp), cbp->cb_snapname);
+       destroy_cbdata_t *cb = arg;
+       const char *name = zfs_get_name(zhp);
+       int err = 0;
+
+       if (nvlist_exists(cb->cb_nvl, name)) {
+               if (cb->cb_firstsnap == NULL)
+                       cb->cb_firstsnap = strdup(name);
+               if (cb->cb_prevsnap != NULL)
+                       free(cb->cb_prevsnap);
+               /* this snap continues the current range */
+               cb->cb_prevsnap = strdup(name);
+               if (cb->cb_firstsnap == NULL || cb->cb_prevsnap == NULL)
+                       nomem();
+               if (cb->cb_verbose) {
+                       if (cb->cb_parsable) {
+                               (void) printf("destroy\t%s\n", name);
+                       } else if (cb->cb_dryrun) {
+                               (void) printf(gettext("would destroy %s\n"),
+                                   name);
+                       } else {
+                               (void) printf(gettext("will destroy %s\n"),
+                                   name);
+                       }
+               }
+       } else if (cb->cb_firstsnap != NULL) {
+               /* end of this range */
+               uint64_t used = 0;
+               err = lzc_snaprange_space(cb->cb_firstsnap,
+                   cb->cb_prevsnap, &used);
+               cb->cb_snapused += used;
+               free(cb->cb_firstsnap);
+               cb->cb_firstsnap = NULL;
+               free(cb->cb_prevsnap);
+               cb->cb_prevsnap = NULL;
+       }
+       zfs_close(zhp);
+       return (err);
+}
 
-       libzfs_print_on_error(g_zfs, B_FALSE);
-       szhp = zfs_open(g_zfs, thissnap, ZFS_TYPE_SNAPSHOT);
-       libzfs_print_on_error(g_zfs, B_TRUE);
-       if (szhp) {
-               /*
-                * Destroy any clones of this snapshot
-                */
-               if (zfs_iter_dependents(szhp, B_FALSE, destroy_callback,
-                   cbp) != 0) {
-                       zfs_close(szhp);
-                       if (closezhp)
-                               zfs_close(zhp);
-                       return (-1);
+static int
+destroy_print_snapshots(zfs_handle_t *fs_zhp, destroy_cbdata_t *cb)
+{
+       int err;
+       assert(cb->cb_firstsnap == NULL);
+       assert(cb->cb_prevsnap == NULL);
+       err = zfs_iter_snapshots_sorted(fs_zhp, destroy_print_cb, cb);
+       if (cb->cb_firstsnap != NULL) {
+               uint64_t used = 0;
+               if (err == 0) {
+                       err = lzc_snaprange_space(cb->cb_firstsnap,
+                           cb->cb_prevsnap, &used);
                }
-               zfs_close(szhp);
+               cb->cb_snapused += used;
+               free(cb->cb_firstsnap);
+               cb->cb_firstsnap = NULL;
+               free(cb->cb_prevsnap);
+               cb->cb_prevsnap = NULL;
        }
+       return (err);
+}
 
-       cbp->cb_closezhp = B_TRUE;
-       rv = zfs_iter_filesystems(zhp, destroy_snap_clones, arg);
-       if (closezhp)
-               zfs_close(zhp);
-       return (rv);
+static int
+snapshot_to_nvl_cb(zfs_handle_t *zhp, void *arg)
+{
+       destroy_cbdata_t *cb = arg;
+       int err = 0;
+
+       /* Check for clones. */
+       if (!cb->cb_doclones && !cb->cb_defer_destroy) {
+               cb->cb_target = zhp;
+               cb->cb_first = B_TRUE;
+               err = zfs_iter_dependents(zhp, B_TRUE,
+                   destroy_check_dependent, cb);
+       }
+
+       if (err == 0) {
+               if (nvlist_add_boolean(cb->cb_nvl, zfs_get_name(zhp)))
+                       nomem();
+       }
+       zfs_close(zhp);
+       return (err);
+}
+
+static int
+gather_snapshots(zfs_handle_t *zhp, void *arg)
+{
+       destroy_cbdata_t *cb = arg;
+       int err = 0;
+
+       err = zfs_iter_snapspec(zhp, cb->cb_snapspec, snapshot_to_nvl_cb, cb);
+       if (err == ENOENT)
+               err = 0;
+       if (err != 0)
+               goto out;
+
+       if (cb->cb_verbose) {
+               err = destroy_print_snapshots(zhp, cb);
+               if (err != 0)
+                       goto out;
+       }
+
+       if (cb->cb_recurse)
+               err = zfs_iter_filesystems(zhp, gather_snapshots, cb);
+
+out:
+       zfs_close(zhp);
+       return (err);
+}
+
+static int
+destroy_clones(destroy_cbdata_t *cb)
+{
+       nvpair_t *pair;
+       for (pair = nvlist_next_nvpair(cb->cb_nvl, NULL);
+           pair != NULL;
+           pair = nvlist_next_nvpair(cb->cb_nvl, pair)) {
+               zfs_handle_t *zhp = zfs_open(g_zfs, nvpair_name(pair),
+                   ZFS_TYPE_SNAPSHOT);
+               if (zhp != NULL) {
+                       boolean_t defer = cb->cb_defer_destroy;
+                       int err;
+
+                       /*
+                        * We can't defer destroy non-snapshots, so set it to
+                        * false while destroying the clones.
+                        */
+                       cb->cb_defer_destroy = B_FALSE;
+                       err = zfs_iter_dependents(zhp, B_FALSE,
+                           destroy_callback, cb);
+                       cb->cb_defer_destroy = defer;
+                       zfs_close(zhp);
+                       if (err != 0)
+                               return (err);
+               }
+       }
+       return (0);
 }
 
 static int
 zfs_do_destroy(int argc, char **argv)
 {
        destroy_cbdata_t cb = { 0 };
+       int rv = 0;
+       int err = 0;
        int c;
-       zfs_handle_t *zhp;
-       char *cp;
+       zfs_handle_t *zhp = NULL;
+       char *at, *pound;
        zfs_type_t type = ZFS_TYPE_DATASET;
 
        /* check options */
-       while ((c = getopt(argc, argv, "dfrR")) != -1) {
+       while ((c = getopt(argc, argv, "vpndfrR")) != -1) {
                switch (c) {
+               case 'v':
+                       cb.cb_verbose = B_TRUE;
+                       break;
+               case 'p':
+                       cb.cb_verbose = B_TRUE;
+                       cb.cb_parsable = B_TRUE;
+                       break;
+               case 'n':
+                       cb.cb_dryrun = B_TRUE;
+                       break;
                case 'd':
                        cb.cb_defer_destroy = B_TRUE;
                        type = ZFS_TYPE_SNAPSHOT;
                        break;
                case 'f':
-                       cb.cb_force = 1;
+                       cb.cb_force = B_TRUE;
                        break;
                case 'r':
-                       cb.cb_recurse = 1;
+                       cb.cb_recurse = B_TRUE;
                        break;
                case 'R':
-                       cb.cb_recurse = 1;
-                       cb.cb_doclones = 1;
+                       cb.cb_recurse = B_TRUE;
+                       cb.cb_doclones = B_TRUE;
                        break;
                case '?':
                default:
@@ -1036,7 +1273,7 @@ zfs_do_destroy(int argc, char **argv)
 
        /* check number of arguments */
        if (argc == 0) {
-               (void) fprintf(stderr, gettext("missing path argument\n"));
+               (void) fprintf(stderr, gettext("missing dataset argument\n"));
                usage(B_FALSE);
        }
        if (argc > 1) {
@@ -1044,93 +1281,178 @@ zfs_do_destroy(int argc, char **argv)
                usage(B_FALSE);
        }
 
-       /*
-        * If we are doing recursive destroy of a snapshot, then the
-        * named snapshot may not exist.  Go straight to libzfs.
-        */
-       if (cb.cb_recurse && (cp = strchr(argv[0], '@'))) {
-               int ret;
+       at = strchr(argv[0], '@');
+       pound = strchr(argv[0], '#');
+       if (at != NULL) {
 
-               *cp = '\0';
-               if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_DATASET)) == NULL)
+               /* Build the list of snaps to destroy in cb_nvl. */
+               cb.cb_nvl = fnvlist_alloc();
+
+               *at = '\0';
+               zhp = zfs_open(g_zfs, argv[0],
+                   ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
+               if (zhp == NULL) {
+                       nvlist_free(cb.cb_nvl);
                        return (1);
-               *cp = '@';
-               cp++;
+               }
 
-               if (cb.cb_doclones) {
-                       boolean_t defer = cb.cb_defer_destroy;
+               cb.cb_snapspec = at + 1;
+               if (gather_snapshots(zfs_handle_dup(zhp), &cb) != 0 ||
+                   cb.cb_error) {
+                       rv = 1;
+                       goto out;
+               }
 
-                       /*
-                        * Temporarily ignore the defer_destroy setting since
-                        * it's not supported for clones.
-                        */
-                       cb.cb_defer_destroy = B_FALSE;
-                       cb.cb_snapname = cp;
-                       if (destroy_snap_clones(zhp, &cb) != 0) {
-                               zfs_close(zhp);
-                               return (1);
+               if (nvlist_empty(cb.cb_nvl)) {
+                       (void) fprintf(stderr, gettext("could not find any "
+                           "snapshots to destroy; check snapshot names.\n"));
+                       rv = 1;
+                       goto out;
+               }
+
+               if (cb.cb_verbose) {
+                       char buf[16];
+                       zfs_nicenum(cb.cb_snapused, buf, sizeof (buf));
+                       if (cb.cb_parsable) {
+                               (void) printf("reclaim\t%llu\n",
+                                   (u_longlong_t)cb.cb_snapused);
+                       } else if (cb.cb_dryrun) {
+                               (void) printf(gettext("would reclaim %s\n"),
+                                   buf);
+                       } else {
+                               (void) printf(gettext("will reclaim %s\n"),
+                                   buf);
                        }
-                       cb.cb_defer_destroy = defer;
                }
 
-               ret = zfs_destroy_snaps(zhp, cp, cb.cb_defer_destroy);
-               zfs_close(zhp);
-               if (ret) {
+               if (!cb.cb_dryrun) {
+                       if (cb.cb_doclones) {
+                               cb.cb_batchedsnaps = fnvlist_alloc();
+                               err = destroy_clones(&cb);
+                               if (err == 0) {
+                                       err = zfs_destroy_snaps_nvl(g_zfs,
+                                           cb.cb_batchedsnaps, B_FALSE);
+                               }
+                               if (err != 0) {
+                                       rv = 1;
+                                       goto out;
+                               }
+                       }
+                       if (err == 0) {
+                               err = zfs_destroy_snaps_nvl(g_zfs, cb.cb_nvl,
+                                   cb.cb_defer_destroy);
+                       }
+               }
+
+               if (err != 0)
+                       rv = 1;
+       } else if (pound != NULL) {
+               int err;
+               nvlist_t *nvl;
+
+               if (cb.cb_dryrun) {
                        (void) fprintf(stderr,
-                           gettext("no snapshots destroyed\n"));
+                           "dryrun is not supported with bookmark\n");
+                       return (-1);
                }
-               return (ret != 0);
-       }
 
-       /* Open the given dataset */
-       if ((zhp = zfs_open(g_zfs, argv[0], type)) == NULL)
-               return (1);
+               if (cb.cb_defer_destroy) {
+                       (void) fprintf(stderr,
+                           "defer destroy is not supported with bookmark\n");
+                       return (-1);
+               }
 
-       cb.cb_target = zhp;
+               if (cb.cb_recurse) {
+                       (void) fprintf(stderr,
+                           "recursive is not supported with bookmark\n");
+                       return (-1);
+               }
 
-       /*
-        * Perform an explicit check for pools before going any further.
-        */
-       if (!cb.cb_recurse && strchr(zfs_get_name(zhp), '/') == NULL &&
-           zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) {
-               (void) fprintf(stderr, gettext("cannot destroy '%s': "
-                   "operation does not apply to pools\n"),
-                   zfs_get_name(zhp));
-               (void) fprintf(stderr, gettext("use 'zfs destroy -r "
-                   "%s' to destroy all datasets in the pool\n"),
-                   zfs_get_name(zhp));
-               (void) fprintf(stderr, gettext("use 'zpool destroy %s' "
-                   "to destroy the pool itself\n"), zfs_get_name(zhp));
-               zfs_close(zhp);
-               return (1);
-       }
+               if (!zfs_bookmark_exists(argv[0])) {
+                       (void) fprintf(stderr, gettext("bookmark '%s' "
+                           "does not exist.\n"), argv[0]);
+                       return (1);
+               }
 
-       /*
-        * Check for any dependents and/or clones.
-        */
-       cb.cb_first = B_TRUE;
-       if (!cb.cb_doclones && !cb.cb_defer_destroy &&
-           zfs_iter_dependents(zhp, B_TRUE, destroy_check_dependent,
-           &cb) != 0) {
-               zfs_close(zhp);
-               return (1);
-       }
+               nvl = fnvlist_alloc();
+               fnvlist_add_boolean(nvl, argv[0]);
 
-       if (cb.cb_error || (!cb.cb_defer_destroy &&
-           (zfs_iter_dependents(zhp, B_FALSE, destroy_callback, &cb) != 0))) {
-               zfs_close(zhp);
-               return (1);
-       }
+               err = lzc_destroy_bookmarks(nvl, NULL);
+               if (err != 0) {
+                       (void) zfs_standard_error(g_zfs, err,
+                           "cannot destroy bookmark");
+               }
 
-       /*
-        * Do the real thing.  The callback will close the handle regardless of
-        * whether it succeeds or not.
-        */
+               nvlist_free(nvl);
 
-       if (destroy_callback(zhp, &cb) != 0)
-               return (1);
+               return (err);
+       } else {
+               /* Open the given dataset */
+               if ((zhp = zfs_open(g_zfs, argv[0], type)) == NULL)
+                       return (1);
 
-       return (0);
+               cb.cb_target = zhp;
+
+               /*
+                * Perform an explicit check for pools before going any further.
+                */
+               if (!cb.cb_recurse && strchr(zfs_get_name(zhp), '/') == NULL &&
+                   zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) {
+                       (void) fprintf(stderr, gettext("cannot destroy '%s': "
+                           "operation does not apply to pools\n"),
+                           zfs_get_name(zhp));
+                       (void) fprintf(stderr, gettext("use 'zfs destroy -r "
+                           "%s' to destroy all datasets in the pool\n"),
+                           zfs_get_name(zhp));
+                       (void) fprintf(stderr, gettext("use 'zpool destroy %s' "
+                           "to destroy the pool itself\n"), zfs_get_name(zhp));
+                       rv = 1;
+                       goto out;
+               }
+
+               /*
+                * Check for any dependents and/or clones.
+                */
+               cb.cb_first = B_TRUE;
+               if (!cb.cb_doclones &&
+                   zfs_iter_dependents(zhp, B_TRUE, destroy_check_dependent,
+                   &cb) != 0) {
+                       rv = 1;
+                       goto out;
+               }
+
+               if (cb.cb_error) {
+                       rv = 1;
+                       goto out;
+               }
+
+               cb.cb_batchedsnaps = fnvlist_alloc();
+               if (zfs_iter_dependents(zhp, B_FALSE, destroy_callback,
+                   &cb) != 0) {
+                       rv = 1;
+                       goto out;
+               }
+
+               /*
+                * Do the real thing.  The callback will close the
+                * handle regardless of whether it succeeds or not.
+                */
+               err = destroy_callback(zhp, &cb);
+               zhp = NULL;
+               if (err == 0) {
+                       err = zfs_destroy_snaps_nvl(g_zfs,
+                           cb.cb_batchedsnaps, cb.cb_defer_destroy);
+               }
+               if (err != 0)
+                       rv = 1;
+       }
+
+out:
+       fnvlist_free(cb.cb_batchedsnaps);
+       fnvlist_free(cb.cb_nvl);
+       if (zhp != NULL)
+               zfs_close(zhp);
+       return (rv);
 }
 
 static boolean_t
@@ -1174,7 +1496,7 @@ get_callback(zfs_handle_t *zhp, void *data)
        char buf[ZFS_MAXPROPLEN];
        char rbuf[ZFS_MAXPROPLEN];
        zprop_source_t sourcetype;
-       char source[ZFS_MAXNAMELEN];
+       char source[ZFS_MAX_DATASET_NAME_LEN];
        zprop_get_cbdata_t *cbp = data;
        nvlist_t *user_props = zfs_get_user_props(zhp);
        zprop_list_t *pl = cbp->cb_proplist;
@@ -1201,7 +1523,7 @@ get_callback(zfs_handle_t *zhp, void *data)
                                if (pl->pl_all)
                                        continue;
                                if (!zfs_prop_valid_for_type(pl->pl_prop,
-                                   ZFS_TYPE_DATASET)) {
+                                   ZFS_TYPE_DATASET, B_FALSE)) {
                                        (void) fprintf(stderr,
                                            gettext("No such property '%s'\n"),
                                            zfs_prop_to_name(pl->pl_prop));
@@ -1230,8 +1552,19 @@ get_callback(zfs_handle_t *zhp, void *data)
 
                        zprop_print_one_property(zfs_get_name(zhp), cbp,
                            pl->pl_user_prop, buf, sourcetype, source, NULL);
-               } else {
-                       if (nvlist_lookup_nvlist(user_props,
+               } else if (zfs_prop_written(pl->pl_user_prop)) {
+                       sourcetype = ZPROP_SRC_LOCAL;
+
+                       if (zfs_prop_get_written(zhp, pl->pl_user_prop,
+                           buf, sizeof (buf), cbp->cb_literal) != 0) {
+                               sourcetype = ZPROP_SRC_NONE;
+                               (void) strlcpy(buf, "-", sizeof (buf));
+                       }
+
+                       zprop_print_one_property(zfs_get_name(zhp), cbp,
+                           pl->pl_user_prop, buf, sourcetype, source, NULL);
+               } else {
+                       if (nvlist_lookup_nvlist(user_props,
                            pl->pl_user_prop, &propval) != 0) {
                                if (pl->pl_all)
                                        continue;
@@ -1274,9 +1607,10 @@ static int
 zfs_do_get(int argc, char **argv)
 {
        zprop_get_cbdata_t cb = { 0 };
-       int i, c, flags = 0;
+       int i, c, flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
+       int types = ZFS_TYPE_DATASET;
        char *value, *fields;
-       int ret;
+       int ret = 0;
        int limit = 0;
        zprop_list_t fake_name = { 0 };
 
@@ -1291,7 +1625,7 @@ zfs_do_get(int argc, char **argv)
        cb.cb_type = ZFS_TYPE_DATASET;
 
        /* check options */
-       while ((c = getopt(argc, argv, ":d:o:s:rHp")) != -1) {
+       while ((c = getopt(argc, argv, ":d:o:s:rt:Hp")) != -1) {
                switch (c) {
                case 'p':
                        cb.cb_literal = B_TRUE;
@@ -1409,6 +1743,42 @@ zfs_do_get(int argc, char **argv)
                        }
                        break;
 
+               case 't':
+                       types = 0;
+                       flags &= ~ZFS_ITER_PROP_LISTSNAPS;
+                       while (*optarg != '\0') {
+                               static char *type_subopts[] = { "filesystem",
+                                   "volume", "snapshot", "bookmark",
+                                   "all", NULL };
+
+                               switch (getsubopt(&optarg, type_subopts,
+                                   &value)) {
+                               case 0:
+                                       types |= ZFS_TYPE_FILESYSTEM;
+                                       break;
+                               case 1:
+                                       types |= ZFS_TYPE_VOLUME;
+                                       break;
+                               case 2:
+                                       types |= ZFS_TYPE_SNAPSHOT;
+                                       break;
+                               case 3:
+                                       types |= ZFS_TYPE_BOOKMARK;
+                                       break;
+                               case 4:
+                                       types = ZFS_TYPE_DATASET |
+                                           ZFS_TYPE_BOOKMARK;
+                                       break;
+
+                               default:
+                                       (void) fprintf(stderr,
+                                           gettext("invalid type '%s'\n"),
+                                           value);
+                                       usage(B_FALSE);
+                               }
+                       }
+                       break;
+
                case '?':
                        (void) fprintf(stderr, gettext("invalid option '%c'\n"),
                            optopt);
@@ -1452,7 +1822,7 @@ zfs_do_get(int argc, char **argv)
        cb.cb_first = B_TRUE;
 
        /* run for each object */
-       ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET, NULL,
+       ret = zfs_for_each(argc, argv, flags, types, NULL,
            &cb.cb_proplist, limit, get_callback, &cb);
 
        if (cb.cb_proplist == &fake_name)
@@ -1492,7 +1862,7 @@ inherit_recurse_cb(zfs_handle_t *zhp, void *data)
         * are not valid for this type of dataset.
         */
        if (prop != ZPROP_INVAL &&
-           !zfs_prop_valid_for_type(prop, zfs_get_type(zhp)))
+           !zfs_prop_valid_for_type(prop, zfs_get_type(zhp), B_FALSE))
                return (0);
 
        return (zfs_prop_inherit(zhp, cb->cb_propname, cb->cb_received) != 0);
@@ -1513,7 +1883,7 @@ zfs_do_inherit(int argc, char **argv)
        zfs_prop_t prop;
        inherit_cbdata_t cb = { 0 };
        char *propname;
-       int ret;
+       int ret = 0;
        int flags = 0;
        boolean_t received = B_FALSE;
 
@@ -1564,9 +1934,13 @@ zfs_do_inherit(int argc, char **argv)
                        if (prop == ZFS_PROP_QUOTA ||
                            prop == ZFS_PROP_RESERVATION ||
                            prop == ZFS_PROP_REFQUOTA ||
-                           prop == ZFS_PROP_REFRESERVATION)
+                           prop == ZFS_PROP_REFRESERVATION) {
                                (void) fprintf(stderr, gettext("use 'zfs set "
                                    "%s=none' to clear\n"), propname);
+                               (void) fprintf(stderr, gettext("use 'zfs "
+                                   "inherit -S %s' to revert to received "
+                                   "value\n"), propname);
+                       }
                        return (1);
                }
                if (received && (prop == ZFS_PROP_VOLSIZE ||
@@ -1602,7 +1976,7 @@ typedef struct upgrade_cbdata {
        uint64_t cb_version;
        boolean_t cb_newer;
        boolean_t cb_foundone;
-       char cb_lastfs[ZFS_MAXNAMELEN];
+       char cb_lastfs[ZFS_MAX_DATASET_NAME_LEN];
 } upgrade_cbdata_t;
 
 static int
@@ -1688,9 +2062,11 @@ upgrade_set_callback(zfs_handle_t *zhp, void *data)
                        /*
                         * If they did "zfs upgrade -a", then we could
                         * be doing ioctls to different pools.  We need
-                        * to log this history once to each pool.
+                        * to log this history once to each pool, and bypass
+                        * the normal history logging that happens in main().
                         */
-                       verify(zpool_stage_history(g_zfs, history_str) == 0);
+                       (void) zpool_log_history(g_zfs, history_str);
+                       log_history = B_FALSE;
                }
                if (zfs_prop_set(zhp, "version", verstr) == 0)
                        cb->cb_numupgraded++;
@@ -1719,7 +2095,7 @@ zfs_do_upgrade(int argc, char **argv)
 {
        boolean_t all = B_FALSE;
        boolean_t showversions = B_FALSE;
-       int ret;
+       int ret = 0;
        upgrade_cbdata_t cb = { 0 };
        signed char c;
        int flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
@@ -1774,8 +2150,8 @@ zfs_do_upgrade(int argc, char **argv)
                    "---------------\n");
                (void) printf(gettext(" 1   Initial ZFS filesystem version\n"));
                (void) printf(gettext(" 2   Enhanced directory entries\n"));
-               (void) printf(gettext(" 3   Case insensitive and File system "
-                   "unique identifier (FUID)\n"));
+               (void) printf(gettext(" 3   Case insensitive and filesystem "
+                   "user identifier (FUID)\n"));
                (void) printf(gettext(" 4   userquota, groupquota "
                    "properties\n"));
                (void) printf(gettext(" 5   System attributes\n"));
@@ -1799,7 +2175,7 @@ zfs_do_upgrade(int argc, char **argv)
                if (cb.cb_numfailed != 0)
                        ret = 1;
        } else {
-               /* List old-version filesytems */
+               /* List old-version filesystems */
                boolean_t found;
                (void) printf(gettext("This system is currently running "
                    "ZFS filesystem version %llu.\n\n"), ZPL_VERSION);
@@ -1825,190 +2201,866 @@ zfs_do_upgrade(int argc, char **argv)
 }
 
 /*
- * zfs userspace
+ * zfs userspace [-Hinp] [-o field[,...]] [-s field [-s field]...]
+ *               [-S field [-S field]...] [-t type[,...]] filesystem | snapshot
+ * zfs groupspace [-Hinp] [-o field[,...]] [-s field [-s field]...]
+ *                [-S field [-S field]...] [-t type[,...]] filesystem | snapshot
+ *
+ *     -H      Scripted mode; elide headers and separate columns by tabs.
+ *     -i      Translate SID to POSIX ID.
+ *     -n      Print numeric ID instead of user/group name.
+ *     -o      Control which fields to display.
+ *     -p      Use exact (parsable) numeric output.
+ *     -s      Specify sort columns, descending order.
+ *     -S      Specify sort columns, ascending order.
+ *     -t      Control which object types to display.
+ *
+ *     Displays space consumed by, and quotas on, each user in the specified
+ *     filesystem or snapshot.
  */
+
+/* us_field_types, us_field_hdr and us_field_names should be kept in sync */
+enum us_field_types {
+       USFIELD_TYPE,
+       USFIELD_NAME,
+       USFIELD_USED,
+       USFIELD_QUOTA,
+       USFIELD_OBJUSED,
+       USFIELD_OBJQUOTA
+};
+static char *us_field_hdr[] = { "TYPE", "NAME", "USED", "QUOTA",
+                                   "OBJUSED", "OBJQUOTA" };
+static char *us_field_names[] = { "type", "name", "used", "quota",
+                                   "objused", "objquota" };
+#define        USFIELD_LAST    (sizeof (us_field_names) / sizeof (char *))
+
+#define        USTYPE_PSX_GRP  (1 << 0)
+#define        USTYPE_PSX_USR  (1 << 1)
+#define        USTYPE_SMB_GRP  (1 << 2)
+#define        USTYPE_SMB_USR  (1 << 3)
+#define        USTYPE_ALL      \
+       (USTYPE_PSX_GRP | USTYPE_PSX_USR | USTYPE_SMB_GRP | USTYPE_SMB_USR)
+
+static int us_type_bits[] = {
+       USTYPE_PSX_GRP,
+       USTYPE_PSX_USR,
+       USTYPE_SMB_GRP,
+       USTYPE_SMB_USR,
+       USTYPE_ALL
+};
+static char *us_type_names[] = { "posixgroup", "posixuser", "smbgroup",
+       "smbuser", "all" };
+
+typedef struct us_node {
+       nvlist_t        *usn_nvl;
+       uu_avl_node_t   usn_avlnode;
+       uu_list_node_t  usn_listnode;
+} us_node_t;
+
+typedef struct us_cbdata {
+       nvlist_t        **cb_nvlp;
+       uu_avl_pool_t   *cb_avl_pool;
+       uu_avl_t        *cb_avl;
+       boolean_t       cb_numname;
+       boolean_t       cb_nicenum;
+       boolean_t       cb_sid2posix;
+       zfs_userquota_prop_t cb_prop;
+       zfs_sort_column_t *cb_sortcol;
+       size_t          cb_width[USFIELD_LAST];
+} us_cbdata_t;
+
+static boolean_t us_populated = B_FALSE;
+
+typedef struct {
+       zfs_sort_column_t *si_sortcol;
+       boolean_t       si_numname;
+} us_sort_info_t;
+
 static int
-userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space)
+us_field_index(char *field)
 {
-       zfs_userquota_prop_t *typep = arg;
-       zfs_userquota_prop_t p = *typep;
-       char *name = NULL;
-       char *ug, *propname;
-       char namebuf[32];
-       char sizebuf[32];
+       int i;
 
-       if (domain == NULL || domain[0] == '\0') {
-               if (p == ZFS_PROP_GROUPUSED || p == ZFS_PROP_GROUPQUOTA) {
-                       struct group *g = getgrgid(rid);
-                       if (g)
-                               name = g->gr_name;
-               } else {
-                       struct passwd *p = getpwuid(rid);
-                       if (p)
-                               name = p->pw_name;
-               }
+       for (i = 0; i < USFIELD_LAST; i++) {
+               if (strcmp(field, us_field_names[i]) == 0)
+                       return (i);
        }
 
-       if (p == ZFS_PROP_GROUPUSED || p == ZFS_PROP_GROUPQUOTA)
-               ug = "group";
-       else
-               ug = "user";
+       return (-1);
+}
 
-       if (p == ZFS_PROP_USERUSED || p == ZFS_PROP_GROUPUSED)
-               propname = "used";
-       else
-               propname = "quota";
+static int
+us_compare(const void *larg, const void *rarg, void *unused)
+{
+       const us_node_t *l = larg;
+       const us_node_t *r = rarg;
+       us_sort_info_t *si = (us_sort_info_t *)unused;
+       zfs_sort_column_t *sortcol = si->si_sortcol;
+       boolean_t numname = si->si_numname;
+       nvlist_t *lnvl = l->usn_nvl;
+       nvlist_t *rnvl = r->usn_nvl;
+       int rc = 0;
+       boolean_t lvb, rvb;
+
+       for (; sortcol != NULL; sortcol = sortcol->sc_next) {
+               char *lvstr = "";
+               char *rvstr = "";
+               uint32_t lv32 = 0;
+               uint32_t rv32 = 0;
+               uint64_t lv64 = 0;
+               uint64_t rv64 = 0;
+               zfs_prop_t prop = sortcol->sc_prop;
+               const char *propname = NULL;
+               boolean_t reverse = sortcol->sc_reverse;
+
+               switch (prop) {
+               case ZFS_PROP_TYPE:
+                       propname = "type";
+                       (void) nvlist_lookup_uint32(lnvl, propname, &lv32);
+                       (void) nvlist_lookup_uint32(rnvl, propname, &rv32);
+                       if (rv32 != lv32)
+                               rc = (rv32 < lv32) ? 1 : -1;
+                       break;
+               case ZFS_PROP_NAME:
+                       propname = "name";
+                       if (numname) {
+compare_nums:
+                               (void) nvlist_lookup_uint64(lnvl, propname,
+                                   &lv64);
+                               (void) nvlist_lookup_uint64(rnvl, propname,
+                                   &rv64);
+                               if (rv64 != lv64)
+                                       rc = (rv64 < lv64) ? 1 : -1;
+                       } else {
+                               if ((nvlist_lookup_string(lnvl, propname,
+                                   &lvstr) == ENOENT) ||
+                                   (nvlist_lookup_string(rnvl, propname,
+                                   &rvstr) == ENOENT)) {
+                                       goto compare_nums;
+                               }
+                               rc = strcmp(lvstr, rvstr);
+                       }
+                       break;
+               case ZFS_PROP_USED:
+               case ZFS_PROP_QUOTA:
+                       if (!us_populated)
+                               break;
+                       if (prop == ZFS_PROP_USED)
+                               propname = "used";
+                       else
+                               propname = "quota";
+                       (void) nvlist_lookup_uint64(lnvl, propname, &lv64);
+                       (void) nvlist_lookup_uint64(rnvl, propname, &rv64);
+                       if (rv64 != lv64)
+                               rc = (rv64 < lv64) ? 1 : -1;
+                       break;
 
-       if (name == NULL) {
-               (void) snprintf(namebuf, sizeof (namebuf),
-                   "%llu", (longlong_t)rid);
-               name = namebuf;
+               default:
+                       break;
+               }
+
+               if (rc != 0) {
+                       if (rc < 0)
+                               return (reverse ? 1 : -1);
+                       else
+                               return (reverse ? -1 : 1);
+               }
        }
-       zfs_nicenum(space, sizebuf, sizeof (sizebuf));
 
-       (void) printf("%s %s %s%c%s %s\n", propname, ug, domain,
-           domain[0] ? '-' : ' ', name, sizebuf);
+       /*
+        * If entries still seem to be the same, check if they are of the same
+        * type (smbentity is added only if we are doing SID to POSIX ID
+        * translation where we can have duplicate type/name combinations).
+        */
+       if (nvlist_lookup_boolean_value(lnvl, "smbentity", &lvb) == 0 &&
+           nvlist_lookup_boolean_value(rnvl, "smbentity", &rvb) == 0 &&
+           lvb != rvb)
+               return (lvb < rvb ? -1 : 1);
 
        return (0);
 }
 
+static boolean_t
+zfs_prop_is_user(unsigned p)
+{
+       return (p == ZFS_PROP_USERUSED || p == ZFS_PROP_USERQUOTA ||
+           p == ZFS_PROP_USEROBJUSED || p == ZFS_PROP_USEROBJQUOTA);
+}
+
+static boolean_t
+zfs_prop_is_group(unsigned p)
+{
+       return (p == ZFS_PROP_GROUPUSED || p == ZFS_PROP_GROUPQUOTA ||
+           p == ZFS_PROP_GROUPOBJUSED || p == ZFS_PROP_GROUPOBJQUOTA);
+}
+
+static inline const char *
+us_type2str(unsigned field_type)
+{
+       switch (field_type) {
+       case USTYPE_PSX_USR:
+               return ("POSIX User");
+       case USTYPE_PSX_GRP:
+               return ("POSIX Group");
+       case USTYPE_SMB_USR:
+               return ("SMB User");
+       case USTYPE_SMB_GRP:
+               return ("SMB Group");
+       default:
+               return ("Undefined");
+       }
+}
+
 static int
-zfs_do_userspace(int argc, char **argv)
+userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space)
 {
-       zfs_handle_t *zhp;
-       zfs_userquota_prop_t p;
-       int error;
+       us_cbdata_t *cb = (us_cbdata_t *)arg;
+       zfs_userquota_prop_t prop = cb->cb_prop;
+       char *name = NULL;
+       char *propname;
+       char sizebuf[32];
+       us_node_t *node;
+       uu_avl_pool_t *avl_pool = cb->cb_avl_pool;
+       uu_avl_t *avl = cb->cb_avl;
+       uu_avl_index_t idx;
+       nvlist_t *props;
+       us_node_t *n;
+       zfs_sort_column_t *sortcol = cb->cb_sortcol;
+       unsigned type = 0;
+       const char *typestr;
+       size_t namelen;
+       size_t typelen;
+       size_t sizelen;
+       int typeidx, nameidx, sizeidx;
+       us_sort_info_t sortinfo = { sortcol, cb->cb_numname };
+       boolean_t smbentity = B_FALSE;
+
+       if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
+               nomem();
+       node = safe_malloc(sizeof (us_node_t));
+       uu_avl_node_init(node, &node->usn_avlnode, avl_pool);
+       node->usn_nvl = props;
+
+       if (domain != NULL && domain[0] != '\0') {
+#ifdef HAVE_IDMAP
+               /* SMB */
+               char sid[MAXNAMELEN + 32];
+               uid_t id;
+               uint64_t classes;
+               int err;
+               directory_error_t e;
+
+               smbentity = B_TRUE;
+
+               (void) snprintf(sid, sizeof (sid), "%s-%u", domain, rid);
+
+               if (prop == ZFS_PROP_GROUPUSED || prop == ZFS_PROP_GROUPQUOTA) {
+                       type = USTYPE_SMB_GRP;
+                       err = sid_to_id(sid, B_FALSE, &id);
+               } else {
+                       type = USTYPE_SMB_USR;
+                       err = sid_to_id(sid, B_TRUE, &id);
+               }
+
+               if (err == 0) {
+                       rid = id;
+                       if (!cb->cb_sid2posix) {
+                               e = directory_name_from_sid(NULL, sid, &name,
+                                   &classes);
+                               if (e != NULL)
+                                       directory_error_free(e);
+                               if (name == NULL)
+                                       name = sid;
+                       }
+               }
+#else
+               nvlist_free(props);
+               free(node);
+
+               return (-1);
+#endif /* HAVE_IDMAP */
+       }
+
+       if (cb->cb_sid2posix || domain == NULL || domain[0] == '\0') {
+               /* POSIX or -i */
+               if (zfs_prop_is_group(prop)) {
+                       type = USTYPE_PSX_GRP;
+                       if (!cb->cb_numname) {
+                               struct group *g;
+
+                               if ((g = getgrgid(rid)) != NULL)
+                                       name = g->gr_name;
+                       }
+               } else {
+                       type = USTYPE_PSX_USR;
+                       if (!cb->cb_numname) {
+                               struct passwd *p;
+
+                               if ((p = getpwuid(rid)) != NULL)
+                                       name = p->pw_name;
+                       }
+               }
+       }
 
        /*
-        * Try the python version.  If the execv fails, we'll continue
-        * and do a simplistic implementation.
+        * Make sure that the type/name combination is unique when doing
+        * SID to POSIX ID translation (hence changing the type from SMB to
+        * POSIX).
         */
-       (void) execv(pypath, argv-1);
+       if (cb->cb_sid2posix &&
+           nvlist_add_boolean_value(props, "smbentity", smbentity) != 0)
+               nomem();
 
-       (void) printf("internal error: %s not found\n"
-           "falling back on built-in implementation, "
-           "some features will not work\n", pypath);
+       /* Calculate/update width of TYPE field */
+       typestr = us_type2str(type);
+       typelen = strlen(gettext(typestr));
+       typeidx = us_field_index("type");
+       if (typelen > cb->cb_width[typeidx])
+               cb->cb_width[typeidx] = typelen;
+       if (nvlist_add_uint32(props, "type", type) != 0)
+               nomem();
 
-       if ((zhp = zfs_open(g_zfs, argv[argc-1], ZFS_TYPE_DATASET)) == NULL)
-               return (1);
+       /* Calculate/update width of NAME field */
+       if ((cb->cb_numname && cb->cb_sid2posix) || name == NULL) {
+               if (nvlist_add_uint64(props, "name", rid) != 0)
+                       nomem();
+               namelen = snprintf(NULL, 0, "%u", rid);
+       } else {
+               if (nvlist_add_string(props, "name", name) != 0)
+                       nomem();
+               namelen = strlen(name);
+       }
+       nameidx = us_field_index("name");
+       if (nameidx >= 0 && namelen > cb->cb_width[nameidx])
+               cb->cb_width[nameidx] = namelen;
 
-       (void) printf("PROP TYPE NAME VALUE\n");
+       /*
+        * Check if this type/name combination is in the list and update it;
+        * otherwise add new node to the list.
+        */
+       if ((n = uu_avl_find(avl, node, &sortinfo, &idx)) == NULL) {
+               uu_avl_insert(avl, node, idx);
+       } else {
+               nvlist_free(props);
+               free(node);
+               node = n;
+               props = node->usn_nvl;
+       }
 
-       for (p = 0; p < ZFS_NUM_USERQUOTA_PROPS; p++) {
-               error = zfs_userspace(zhp, p, userspace_cb, &p);
-               if (error)
-                       break;
+       /* Calculate/update width of USED/QUOTA fields */
+       if (cb->cb_nicenum)
+               zfs_nicenum(space, sizebuf, sizeof (sizebuf));
+       else
+               (void) snprintf(sizebuf, sizeof (sizebuf), "%llu",
+                   (u_longlong_t)space);
+       sizelen = strlen(sizebuf);
+       if (prop == ZFS_PROP_USERUSED || prop == ZFS_PROP_GROUPUSED) {
+               propname = "used";
+               if (!nvlist_exists(props, "quota"))
+                       (void) nvlist_add_uint64(props, "quota", 0);
+       } else if (prop == ZFS_PROP_USERQUOTA || prop == ZFS_PROP_GROUPQUOTA) {
+               propname = "quota";
+               if (!nvlist_exists(props, "used"))
+                       (void) nvlist_add_uint64(props, "used", 0);
+       } else if (prop == ZFS_PROP_USEROBJUSED ||
+           prop == ZFS_PROP_GROUPOBJUSED) {
+               propname = "objused";
+               if (!nvlist_exists(props, "objquota"))
+                       (void) nvlist_add_uint64(props, "objquota", 0);
+       } else if (prop == ZFS_PROP_USEROBJQUOTA ||
+           prop == ZFS_PROP_GROUPOBJQUOTA) {
+               propname = "objquota";
+               if (!nvlist_exists(props, "objused"))
+                       (void) nvlist_add_uint64(props, "objused", 0);
+       } else {
+               return (-1);
        }
-       return (error);
-}
+       sizeidx = us_field_index(propname);
+       if (sizeidx >= 0 && sizelen > cb->cb_width[sizeidx])
+               cb->cb_width[sizeidx] = sizelen;
 
-/*
- * list [-r][-d max] [-H] [-o property[,property]...] [-t type[,type]...]
- *      [-s property [-s property]...] [-S property [-S property]...]
- *      <dataset> ...
- *
- *     -r      Recurse over all children
- *     -d      Limit recursion by depth.
- *     -H      Scripted mode; elide headers and separate columns by tabs
- *     -o      Control which fields to display.
- *     -t      Control which object types to display.
- *     -s      Specify sort columns, descending order.
- *     -S      Specify sort columns, ascending order.
- *
- * When given no arguments, lists all filesystems in the system.
- * Otherwise, list the specified datasets, optionally recursing down them if
- * '-r' is specified.
- */
-typedef struct list_cbdata {
-       boolean_t       cb_first;
-       boolean_t       cb_scripted;
-       zprop_list_t    *cb_proplist;
-} list_cbdata_t;
+       if (nvlist_add_uint64(props, propname, space) != 0)
+               nomem();
+
+       return (0);
+}
 
-/*
- * Given a list of columns to display, output appropriate headers for each one.
- */
 static void
-print_header(zprop_list_t *pl)
+print_us_node(boolean_t scripted, boolean_t parsable, int *fields, int types,
+    size_t *width, us_node_t *node)
 {
-       char headerbuf[ZFS_MAXPROPLEN];
-       const char *header;
-       int i;
+       nvlist_t *nvl = node->usn_nvl;
+       char valstr[MAXNAMELEN];
        boolean_t first = B_TRUE;
-       boolean_t right_justify;
+       int cfield = 0;
+       int field;
+       uint32_t ustype;
 
-       for (; pl != NULL; pl = pl->pl_next) {
-               if (!first) {
-                       (void) printf("  ");
-               } else {
-                       first = B_FALSE;
+       /* Check type */
+       (void) nvlist_lookup_uint32(nvl, "type", &ustype);
+       if (!(ustype & types))
+               return;
+
+       while ((field = fields[cfield]) != USFIELD_LAST) {
+               nvpair_t *nvp = NULL;
+               data_type_t type;
+               uint32_t val32;
+               uint64_t val64;
+               char *strval = "-";
+
+               while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) {
+                       if (strcmp(nvpair_name(nvp),
+                           us_field_names[field]) == 0)
+                               break;
                }
 
-               right_justify = B_FALSE;
-               if (pl->pl_prop != ZPROP_INVAL) {
-                       header = zfs_prop_column_name(pl->pl_prop);
-                       right_justify = zfs_prop_align_right(pl->pl_prop);
-               } else {
-                       for (i = 0; pl->pl_user_prop[i] != '\0'; i++)
-                               headerbuf[i] = toupper(pl->pl_user_prop[i]);
-                       headerbuf[i] = '\0';
-                       header = headerbuf;
+               type = nvp == NULL ? DATA_TYPE_UNKNOWN : nvpair_type(nvp);
+               switch (type) {
+               case DATA_TYPE_UINT32:
+                       (void) nvpair_value_uint32(nvp, &val32);
+                       break;
+               case DATA_TYPE_UINT64:
+                       (void) nvpair_value_uint64(nvp, &val64);
+                       break;
+               case DATA_TYPE_STRING:
+                       (void) nvpair_value_string(nvp, &strval);
+                       break;
+               case DATA_TYPE_UNKNOWN:
+                       break;
+               default:
+                       (void) fprintf(stderr, "invalid data type\n");
                }
 
-               if (pl->pl_next == NULL && !right_justify)
-                       (void) printf("%s", header);
-               else if (right_justify)
-                       (void) printf("%*s", (int)pl->pl_width, header);
+               switch (field) {
+               case USFIELD_TYPE:
+                       if (type == DATA_TYPE_UINT32)
+                               strval = (char *)us_type2str(val32);
+                       break;
+               case USFIELD_NAME:
+                       if (type == DATA_TYPE_UINT64) {
+                               (void) sprintf(valstr, "%llu",
+                                   (u_longlong_t)val64);
+                               strval = valstr;
+                       }
+                       break;
+               case USFIELD_USED:
+               case USFIELD_QUOTA:
+               case USFIELD_OBJUSED:
+               case USFIELD_OBJQUOTA:
+                       if (type == DATA_TYPE_UINT64) {
+                               if (parsable) {
+                                       (void) sprintf(valstr, "%llu",
+                                           (u_longlong_t)val64);
+                               } else {
+                                       zfs_nicenum(val64, valstr,
+                                           sizeof (valstr));
+                               }
+                               if ((field == USFIELD_QUOTA ||
+                                   field == USFIELD_OBJQUOTA) &&
+                                   strcmp(valstr, "0") == 0)
+                                       strval = "none";
+                               else
+                                       strval = valstr;
+                       }
+                       break;
+               }
+
+               if (!first) {
+                       if (scripted)
+                               (void) printf("\t");
+                       else
+                               (void) printf("  ");
+               }
+               if (scripted)
+                       (void) printf("%s", strval);
+               else if (field == USFIELD_TYPE || field == USFIELD_NAME)
+                       (void) printf("%-*s", (int)width[field], strval);
                else
-                       (void) printf("%-*s", (int)pl->pl_width, header);
+                       (void) printf("%*s", (int)width[field], strval);
+
+               first = B_FALSE;
+               cfield++;
        }
 
        (void) printf("\n");
 }
 
-/*
- * Given a dataset and a list of fields, print out all the properties according
- * to the described layout.
- */
 static void
-print_dataset(zfs_handle_t *zhp, zprop_list_t *pl, boolean_t scripted)
+print_us(boolean_t scripted, boolean_t parsable, int *fields, int types,
+    size_t *width, boolean_t rmnode, uu_avl_t *avl)
 {
-       boolean_t first = B_TRUE;
-       char property[ZFS_MAXPROPLEN];
-       nvlist_t *userprops = zfs_get_user_props(zhp);
-       nvlist_t *propval;
-       char *propstr;
-       boolean_t right_justify;
-       int width;
-
-       for (; pl != NULL; pl = pl->pl_next) {
-               if (!first) {
-                       if (scripted)
-                               (void) printf("\t");
-                       else
-                               (void) printf("  ");
-               } else {
+       us_node_t *node;
+       const char *col;
+       int cfield = 0;
+       int field;
+
+       if (!scripted) {
+               boolean_t first = B_TRUE;
+
+               while ((field = fields[cfield]) != USFIELD_LAST) {
+                       col = gettext(us_field_hdr[field]);
+                       if (field == USFIELD_TYPE || field == USFIELD_NAME) {
+                               (void) printf(first ? "%-*s" : "  %-*s",
+                                   (int)width[field], col);
+                       } else {
+                               (void) printf(first ? "%*s" : "  %*s",
+                                   (int)width[field], col);
+                       }
                        first = B_FALSE;
+                       cfield++;
                }
+               (void) printf("\n");
+       }
 
-               if (pl->pl_prop != ZPROP_INVAL) {
-                       if (zfs_prop_get(zhp, pl->pl_prop, property,
-                           sizeof (property), NULL, NULL, 0, B_FALSE) != 0)
-                               propstr = "-";
-                       else
-                               propstr = property;
+       for (node = uu_avl_first(avl); node; node = uu_avl_next(avl, node)) {
+               print_us_node(scripted, parsable, fields, types, width, node);
+               if (rmnode)
+                       nvlist_free(node->usn_nvl);
+       }
+}
 
-                       right_justify = zfs_prop_align_right(pl->pl_prop);
-               } else if (zfs_prop_userquota(pl->pl_user_prop)) {
-                       if (zfs_prop_get_userquota(zhp, pl->pl_user_prop,
-                           property, sizeof (property), B_FALSE) != 0)
-                               propstr = "-";
-                       else
-                               propstr = property;
-                       right_justify = B_TRUE;
-               } else {
-                       if (nvlist_lookup_nvlist(userprops,
-                           pl->pl_user_prop, &propval) != 0)
+static int
+zfs_do_userspace(int argc, char **argv)
+{
+       zfs_handle_t *zhp;
+       zfs_userquota_prop_t p;
+       uu_avl_pool_t *avl_pool;
+       uu_avl_t *avl_tree;
+       uu_avl_walk_t *walk;
+       char *delim;
+       char deffields[] = "type,name,used,quota,objused,objquota";
+       char *ofield = NULL;
+       char *tfield = NULL;
+       int cfield = 0;
+       int fields[256];
+       int i;
+       boolean_t scripted = B_FALSE;
+       boolean_t prtnum = B_FALSE;
+       boolean_t parsable = B_FALSE;
+       boolean_t sid2posix = B_FALSE;
+       int ret = 0;
+       int c;
+       zfs_sort_column_t *sortcol = NULL;
+       int types = USTYPE_PSX_USR | USTYPE_SMB_USR;
+       us_cbdata_t cb;
+       us_node_t *node;
+       us_node_t *rmnode;
+       uu_list_pool_t *listpool;
+       uu_list_t *list;
+       uu_avl_index_t idx = 0;
+       uu_list_index_t idx2 = 0;
+
+       if (argc < 2)
+               usage(B_FALSE);
+
+       if (strcmp(argv[0], "groupspace") == 0)
+               /* Toggle default group types */
+               types = USTYPE_PSX_GRP | USTYPE_SMB_GRP;
+
+       while ((c = getopt(argc, argv, "nHpo:s:S:t:i")) != -1) {
+               switch (c) {
+               case 'n':
+                       prtnum = B_TRUE;
+                       break;
+               case 'H':
+                       scripted = B_TRUE;
+                       break;
+               case 'p':
+                       parsable = B_TRUE;
+                       break;
+               case 'o':
+                       ofield = optarg;
+                       break;
+               case 's':
+               case 'S':
+                       if (zfs_add_sort_column(&sortcol, optarg,
+                           c == 's' ? B_FALSE : B_TRUE) != 0) {
+                               (void) fprintf(stderr,
+                                   gettext("invalid field '%s'\n"), optarg);
+                               usage(B_FALSE);
+                       }
+                       break;
+               case 't':
+                       tfield = optarg;
+                       break;
+               case 'i':
+                       sid2posix = B_TRUE;
+                       break;
+               case ':':
+                       (void) fprintf(stderr, gettext("missing argument for "
+                           "'%c' option\n"), optopt);
+                       usage(B_FALSE);
+                       break;
+               case '?':
+                       (void) fprintf(stderr, gettext("invalid option '%c'\n"),
+                           optopt);
+                       usage(B_FALSE);
+               }
+       }
+
+       argc -= optind;
+       argv += optind;
+
+       if (argc < 1) {
+               (void) fprintf(stderr, gettext("missing dataset name\n"));
+               usage(B_FALSE);
+       }
+       if (argc > 1) {
+               (void) fprintf(stderr, gettext("too many arguments\n"));
+               usage(B_FALSE);
+       }
+
+       /* Use default output fields if not specified using -o */
+       if (ofield == NULL)
+               ofield = deffields;
+       do {
+               if ((delim = strchr(ofield, ',')) != NULL)
+                       *delim = '\0';
+               if ((fields[cfield++] = us_field_index(ofield)) == -1) {
+                       (void) fprintf(stderr, gettext("invalid type '%s' "
+                           "for -o option\n"), ofield);
+                       return (-1);
+               }
+               if (delim != NULL)
+                       ofield = delim + 1;
+       } while (delim != NULL);
+       fields[cfield] = USFIELD_LAST;
+
+       /* Override output types (-t option) */
+       if (tfield != NULL) {
+               types = 0;
+
+               do {
+                       boolean_t found = B_FALSE;
+
+                       if ((delim = strchr(tfield, ',')) != NULL)
+                               *delim = '\0';
+                       for (i = 0; i < sizeof (us_type_bits) / sizeof (int);
+                           i++) {
+                               if (strcmp(tfield, us_type_names[i]) == 0) {
+                                       found = B_TRUE;
+                                       types |= us_type_bits[i];
+                                       break;
+                               }
+                       }
+                       if (!found) {
+                               (void) fprintf(stderr, gettext("invalid type "
+                                   "'%s' for -t option\n"), tfield);
+                               return (-1);
+                       }
+                       if (delim != NULL)
+                               tfield = delim + 1;
+               } while (delim != NULL);
+       }
+
+       if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_DATASET)) == NULL)
+               return (1);
+
+       if ((avl_pool = uu_avl_pool_create("us_avl_pool", sizeof (us_node_t),
+           offsetof(us_node_t, usn_avlnode), us_compare, UU_DEFAULT)) == NULL)
+               nomem();
+       if ((avl_tree = uu_avl_create(avl_pool, NULL, UU_DEFAULT)) == NULL)
+               nomem();
+
+       /* Always add default sorting columns */
+       (void) zfs_add_sort_column(&sortcol, "type", B_FALSE);
+       (void) zfs_add_sort_column(&sortcol, "name", B_FALSE);
+
+       cb.cb_sortcol = sortcol;
+       cb.cb_numname = prtnum;
+       cb.cb_nicenum = !parsable;
+       cb.cb_avl_pool = avl_pool;
+       cb.cb_avl = avl_tree;
+       cb.cb_sid2posix = sid2posix;
+
+       for (i = 0; i < USFIELD_LAST; i++)
+               cb.cb_width[i] = strlen(gettext(us_field_hdr[i]));
+
+       for (p = 0; p < ZFS_NUM_USERQUOTA_PROPS; p++) {
+               if ((zfs_prop_is_user(p) &&
+                   !(types & (USTYPE_PSX_USR | USTYPE_SMB_USR))) ||
+                   (zfs_prop_is_group(p) &&
+                   !(types & (USTYPE_PSX_GRP | USTYPE_SMB_GRP))))
+                       continue;
+
+               cb.cb_prop = p;
+               if ((ret = zfs_userspace(zhp, p, userspace_cb, &cb)) != 0)
+                       return (ret);
+       }
+
+       /* Sort the list */
+       if ((node = uu_avl_first(avl_tree)) == NULL)
+               return (0);
+
+       us_populated = B_TRUE;
+
+       listpool = uu_list_pool_create("tmplist", sizeof (us_node_t),
+           offsetof(us_node_t, usn_listnode), NULL, UU_DEFAULT);
+       list = uu_list_create(listpool, NULL, UU_DEFAULT);
+       uu_list_node_init(node, &node->usn_listnode, listpool);
+
+       while (node != NULL) {
+               rmnode = node;
+               node = uu_avl_next(avl_tree, node);
+               uu_avl_remove(avl_tree, rmnode);
+               if (uu_list_find(list, rmnode, NULL, &idx2) == NULL)
+                       uu_list_insert(list, rmnode, idx2);
+       }
+
+       for (node = uu_list_first(list); node != NULL;
+           node = uu_list_next(list, node)) {
+               us_sort_info_t sortinfo = { sortcol, cb.cb_numname };
+
+               if (uu_avl_find(avl_tree, node, &sortinfo, &idx) == NULL)
+                       uu_avl_insert(avl_tree, node, idx);
+       }
+
+       uu_list_destroy(list);
+       uu_list_pool_destroy(listpool);
+
+       /* Print and free node nvlist memory */
+       print_us(scripted, parsable, fields, types, cb.cb_width, B_TRUE,
+           cb.cb_avl);
+
+       zfs_free_sort_columns(sortcol);
+
+       /* Clean up the AVL tree */
+       if ((walk = uu_avl_walk_start(cb.cb_avl, UU_WALK_ROBUST)) == NULL)
+               nomem();
+
+       while ((node = uu_avl_walk_next(walk)) != NULL) {
+               uu_avl_remove(cb.cb_avl, node);
+               free(node);
+       }
+
+       uu_avl_walk_end(walk);
+       uu_avl_destroy(avl_tree);
+       uu_avl_pool_destroy(avl_pool);
+
+       return (ret);
+}
+
+/*
+ * list [-Hp][-r|-d max] [-o property[,...]] [-s property] ... [-S property]
+ *      [-t type[,...]] [filesystem|volume|snapshot] ...
+ *
+ *     -H      Scripted mode; elide headers and separate columns by tabs
+ *     -p      Display values in parsable (literal) format.
+ *     -r      Recurse over all children
+ *     -d      Limit recursion by depth.
+ *     -o      Control which fields to display.
+ *     -s      Specify sort columns, descending order.
+ *     -S      Specify sort columns, ascending order.
+ *     -t      Control which object types to display.
+ *
+ * When given no arguments, list all filesystems in the system.
+ * Otherwise, list the specified datasets, optionally recursing down them if
+ * '-r' is specified.
+ */
+typedef struct list_cbdata {
+       boolean_t       cb_first;
+       boolean_t       cb_literal;
+       boolean_t       cb_scripted;
+       zprop_list_t    *cb_proplist;
+} list_cbdata_t;
+
+/*
+ * Given a list of columns to display, output appropriate headers for each one.
+ */
+static void
+print_header(list_cbdata_t *cb)
+{
+       zprop_list_t *pl = cb->cb_proplist;
+       char headerbuf[ZFS_MAXPROPLEN];
+       const char *header;
+       int i;
+       boolean_t first = B_TRUE;
+       boolean_t right_justify;
+
+       for (; pl != NULL; pl = pl->pl_next) {
+               if (!first) {
+                       (void) printf("  ");
+               } else {
+                       first = B_FALSE;
+               }
+
+               right_justify = B_FALSE;
+               if (pl->pl_prop != ZPROP_INVAL) {
+                       header = zfs_prop_column_name(pl->pl_prop);
+                       right_justify = zfs_prop_align_right(pl->pl_prop);
+               } else {
+                       for (i = 0; pl->pl_user_prop[i] != '\0'; i++)
+                               headerbuf[i] = toupper(pl->pl_user_prop[i]);
+                       headerbuf[i] = '\0';
+                       header = headerbuf;
+               }
+
+               if (pl->pl_next == NULL && !right_justify)
+                       (void) printf("%s", header);
+               else if (right_justify)
+                       (void) printf("%*s", (int)pl->pl_width, header);
+               else
+                       (void) printf("%-*s", (int)pl->pl_width, header);
+       }
+
+       (void) printf("\n");
+}
+
+/*
+ * Given a dataset and a list of fields, print out all the properties according
+ * to the described layout.
+ */
+static void
+print_dataset(zfs_handle_t *zhp, list_cbdata_t *cb)
+{
+       zprop_list_t *pl = cb->cb_proplist;
+       boolean_t first = B_TRUE;
+       char property[ZFS_MAXPROPLEN];
+       nvlist_t *userprops = zfs_get_user_props(zhp);
+       nvlist_t *propval;
+       char *propstr;
+       boolean_t right_justify;
+
+       for (; pl != NULL; pl = pl->pl_next) {
+               if (!first) {
+                       if (cb->cb_scripted)
+                               (void) printf("\t");
+                       else
+                               (void) printf("  ");
+               } else {
+                       first = B_FALSE;
+               }
+
+               if (pl->pl_prop == ZFS_PROP_NAME) {
+                       (void) strlcpy(property, zfs_get_name(zhp),
+                           sizeof (property));
+                       propstr = property;
+                       right_justify = zfs_prop_align_right(pl->pl_prop);
+               } else if (pl->pl_prop != ZPROP_INVAL) {
+                       if (zfs_prop_get(zhp, pl->pl_prop, property,
+                           sizeof (property), NULL, NULL, 0,
+                           cb->cb_literal) != 0)
+                               propstr = "-";
+                       else
+                               propstr = property;
+                       right_justify = zfs_prop_align_right(pl->pl_prop);
+               } else if (zfs_prop_userquota(pl->pl_user_prop)) {
+                       if (zfs_prop_get_userquota(zhp, pl->pl_user_prop,
+                           property, sizeof (property), cb->cb_literal) != 0)
+                               propstr = "-";
+                       else
+                               propstr = property;
+                       right_justify = B_TRUE;
+               } else if (zfs_prop_written(pl->pl_user_prop)) {
+                       if (zfs_prop_get_written(zhp, pl->pl_user_prop,
+                           property, sizeof (property), cb->cb_literal) != 0)
+                               propstr = "-";
+                       else
+                               propstr = property;
+                       right_justify = B_TRUE;
+               } else {
+                       if (nvlist_lookup_nvlist(userprops,
+                           pl->pl_user_prop, &propval) != 0)
                                propstr = "-";
                        else
                                verify(nvlist_lookup_string(propval,
@@ -2016,19 +3068,17 @@ print_dataset(zfs_handle_t *zhp, zprop_list_t *pl, boolean_t scripted)
                        right_justify = B_FALSE;
                }
 
-               width = pl->pl_width;
-
                /*
                 * If this is being called in scripted mode, or if this is the
                 * last column and it is left-justified, don't include a width
                 * format specifier.
                 */
-               if (scripted || (pl->pl_next == NULL && !right_justify))
+               if (cb->cb_scripted || (pl->pl_next == NULL && !right_justify))
                        (void) printf("%s", propstr);
                else if (right_justify)
-                       (void) printf("%*s", width, propstr);
+                       (void) printf("%*s", (int)pl->pl_width, propstr);
                else
-                       (void) printf("%-*s", width, propstr);
+                       (void) printf("%-*s", (int)pl->pl_width, propstr);
        }
 
        (void) printf("\n");
@@ -2044,11 +3094,11 @@ list_callback(zfs_handle_t *zhp, void *data)
 
        if (cbp->cb_first) {
                if (!cbp->cb_scripted)
-                       print_header(cbp->cb_proplist);
+                       print_header(cbp);
                cbp->cb_first = B_FALSE;
        }
 
-       print_dataset(zhp, cbp->cb_proplist, cbp->cb_scripted);
+       print_dataset(zhp, cbp);
 
        return (0);
 }
@@ -2057,7 +3107,6 @@ static int
 zfs_do_list(int argc, char **argv)
 {
        int c;
-       boolean_t scripted = B_FALSE;
        static char default_fields[] =
            "name,used,available,referenced,mountpoint";
        int types = ZFS_TYPE_DATASET;
@@ -2066,16 +3115,20 @@ zfs_do_list(int argc, char **argv)
        list_cbdata_t cb = { 0 };
        char *value;
        int limit = 0;
-       int ret;
+       int ret = 0;
        zfs_sort_column_t *sortcol = NULL;
        int flags = ZFS_ITER_PROP_LISTSNAPS | ZFS_ITER_ARGS_CAN_BE_PATHS;
 
        /* check options */
-       while ((c = getopt(argc, argv, ":d:o:rt:Hs:S:")) != -1) {
+       while ((c = getopt(argc, argv, "HS:d:o:prs:t:")) != -1) {
                switch (c) {
                case 'o':
                        fields = optarg;
                        break;
+               case 'p':
+                       cb.cb_literal = B_TRUE;
+                       flags |= ZFS_ITER_LITERAL_PROPS;
+                       break;
                case 'd':
                        limit = parse_depth(optarg, &flags);
                        break;
@@ -2083,7 +3136,7 @@ zfs_do_list(int argc, char **argv)
                        flags |= ZFS_ITER_RECURSE;
                        break;
                case 'H':
-                       scripted = B_TRUE;
+                       cb.cb_scripted = B_TRUE;
                        break;
                case 's':
                        if (zfs_add_sort_column(&sortcol, optarg,
@@ -2107,7 +3160,8 @@ zfs_do_list(int argc, char **argv)
                        flags &= ~ZFS_ITER_PROP_LISTSNAPS;
                        while (*optarg != '\0') {
                                static char *type_subopts[] = { "filesystem",
-                                   "volume", "snapshot", "all", NULL };
+                                   "volume", "snapshot", "snap", "bookmark",
+                                   "all", NULL };
 
                                switch (getsubopt(&optarg, type_subopts,
                                    &value)) {
@@ -2118,12 +3172,16 @@ zfs_do_list(int argc, char **argv)
                                        types |= ZFS_TYPE_VOLUME;
                                        break;
                                case 2:
+                               case 3:
                                        types |= ZFS_TYPE_SNAPSHOT;
                                        break;
-                               case 3:
-                                       types = ZFS_TYPE_DATASET;
+                               case 4:
+                                       types |= ZFS_TYPE_BOOKMARK;
+                                       break;
+                               case 5:
+                                       types = ZFS_TYPE_DATASET |
+                                           ZFS_TYPE_BOOKMARK;
                                        break;
-
                                default:
                                        (void) fprintf(stderr,
                                            gettext("invalid type '%s'\n"),
@@ -2150,6 +3208,13 @@ zfs_do_list(int argc, char **argv)
        if (fields == NULL)
                fields = default_fields;
 
+       /*
+        * If we are only going to list snapshot names and sort by name,
+        * then we can use faster version.
+        */
+       if (strcmp(fields, "name") == 0 && zfs_sort_only_by_name(sortcol))
+               flags |= ZFS_ITER_SIMPLE;
+
        /*
         * If "-o space" and no types were specified, don't display snapshots.
         */
@@ -2165,7 +3230,6 @@ zfs_do_list(int argc, char **argv)
            != 0)
                usage(B_FALSE);
 
-       cb.cb_scripted = scripted;
        cb.cb_first = B_TRUE;
 
        ret = zfs_for_each(argc, argv, flags, types, sortcol, &cb.cb_proplist,
@@ -2175,14 +3239,14 @@ zfs_do_list(int argc, char **argv)
        zfs_free_sort_columns(sortcol);
 
        if (ret == 0 && cb.cb_first && !cb.cb_scripted)
-               (void) printf(gettext("no datasets available\n"));
+               (void) fprintf(stderr, gettext("no datasets available\n"));
 
        return (ret);
 }
 
 /*
- * zfs rename <fs | snap | vol> <fs | snap | vol>
- * zfs rename -p <fs | vol> <fs | vol>
+ * zfs rename [-f] <fs | snap | vol> <fs | snap | vol>
+ * zfs rename [-f] -p <fs | vol> <fs | vol>
  * zfs rename -r <snap> <snap>
  *
  * Renames the given dataset to another of the same type.
@@ -2195,12 +3259,13 @@ zfs_do_rename(int argc, char **argv)
 {
        zfs_handle_t *zhp;
        int c;
-       int ret;
+       int ret = 0;
        boolean_t recurse = B_FALSE;
        boolean_t parents = B_FALSE;
+       boolean_t force_unmount = B_FALSE;
 
        /* check options */
-       while ((c = getopt(argc, argv, "pr")) != -1) {
+       while ((c = getopt(argc, argv, "prf")) != -1) {
                switch (c) {
                case 'p':
                        parents = B_TRUE;
@@ -2208,6 +3273,9 @@ zfs_do_rename(int argc, char **argv)
                case 'r':
                        recurse = B_TRUE;
                        break;
+               case 'f':
+                       force_unmount = B_TRUE;
+                       break;
                case '?':
                default:
                        (void) fprintf(stderr, gettext("invalid option '%c'\n"),
@@ -2258,7 +3326,7 @@ zfs_do_rename(int argc, char **argv)
                return (1);
        }
 
-       ret = (zfs_rename(zhp, argv[1], recurse) != 0);
+       ret = (zfs_rename(zhp, argv[1], recurse, force_unmount) != 0);
 
        zfs_close(zhp);
        return (ret);
@@ -2274,7 +3342,7 @@ static int
 zfs_do_promote(int argc, char **argv)
 {
        zfs_handle_t *zhp;
-       int ret;
+       int ret = 0;
 
        /* check options */
        if (argc > 1 && argv[1][0] == '-') {
@@ -2310,7 +3378,7 @@ zfs_do_promote(int argc, char **argv)
  *
  *     -r      Delete any intervening snapshots before doing rollback
  *     -R      Delete any snapshots and their clones
- *     -f      ignored for backwards compatability
+ *     -f      ignored for backwards compatibility
  *
  * Given a filesystem, rollback to a specific snapshot, discarding any changes
  * since then and making it the active dataset.  If more recent snapshots exist,
@@ -2323,9 +3391,31 @@ typedef struct rollback_cbdata {
        char            *cb_target;
        int             cb_error;
        boolean_t       cb_recurse;
-       boolean_t       cb_dependent;
 } rollback_cbdata_t;
 
+static int
+rollback_check_dependent(zfs_handle_t *zhp, void *data)
+{
+       rollback_cbdata_t *cbp = data;
+
+       if (cbp->cb_first && cbp->cb_recurse) {
+               (void) fprintf(stderr, gettext("cannot rollback to "
+                   "'%s': clones of previous snapshots exist\n"),
+                   cbp->cb_target);
+               (void) fprintf(stderr, gettext("use '-R' to "
+                   "force deletion of the following clones and "
+                   "dependents:\n"));
+               cbp->cb_first = 0;
+               cbp->cb_error = 1;
+       }
+
+       (void) fprintf(stderr, "%s\n", zfs_get_name(zhp));
+
+       zfs_close(zhp);
+       return (0);
+}
+
+
 /*
  * Report any snapshots more recent than the one specified.  Used when '-r' is
  * not specified.  We reuse this same callback for the snapshot dependents - if
@@ -2342,52 +3432,30 @@ rollback_check(zfs_handle_t *zhp, void *data)
                return (0);
        }
 
-       if (!cbp->cb_dependent) {
-               if (strcmp(zfs_get_name(zhp), cbp->cb_target) != 0 &&
-                   zfs_get_type(zhp) == ZFS_TYPE_SNAPSHOT &&
-                   zfs_prop_get_int(zhp, ZFS_PROP_CREATETXG) >
-                   cbp->cb_create) {
-
-                       if (cbp->cb_first && !cbp->cb_recurse) {
-                               (void) fprintf(stderr, gettext("cannot "
-                                   "rollback to '%s': more recent snapshots "
-                                   "exist\n"),
-                                   cbp->cb_target);
-                               (void) fprintf(stderr, gettext("use '-r' to "
-                                   "force deletion of the following "
-                                   "snapshots:\n"));
-                               cbp->cb_first = 0;
-                               cbp->cb_error = 1;
-                       }
-
-                       if (cbp->cb_recurse) {
-                               cbp->cb_dependent = B_TRUE;
-                               if (zfs_iter_dependents(zhp, B_TRUE,
-                                   rollback_check, cbp) != 0) {
-                                       zfs_close(zhp);
-                                       return (-1);
-                               }
-                               cbp->cb_dependent = B_FALSE;
-                       } else {
-                               (void) fprintf(stderr, "%s\n",
-                                   zfs_get_name(zhp));
-                       }
-               }
-       } else {
-               if (cbp->cb_first && cbp->cb_recurse) {
-                       (void) fprintf(stderr, gettext("cannot rollback to "
-                           "'%s': clones of previous snapshots exist\n"),
+       if (zfs_prop_get_int(zhp, ZFS_PROP_CREATETXG) > cbp->cb_create) {
+               if (cbp->cb_first && !cbp->cb_recurse) {
+                       (void) fprintf(stderr, gettext("cannot "
+                           "rollback to '%s': more recent snapshots "
+                           "or bookmarks exist\n"),
                            cbp->cb_target);
-                       (void) fprintf(stderr, gettext("use '-R' to "
-                           "force deletion of the following clones and "
-                           "dependents:\n"));
+                       (void) fprintf(stderr, gettext("use '-r' to "
+                           "force deletion of the following "
+                           "snapshots and bookmarks:\n"));
                        cbp->cb_first = 0;
                        cbp->cb_error = 1;
                }
 
-               (void) fprintf(stderr, "%s\n", zfs_get_name(zhp));
+               if (cbp->cb_recurse) {
+                       if (zfs_iter_dependents(zhp, B_TRUE,
+                           rollback_check_dependent, cbp) != 0) {
+                               zfs_close(zhp);
+                               return (-1);
+                       }
+               } else {
+                       (void) fprintf(stderr, "%s\n",
+                           zfs_get_name(zhp));
+               }
        }
-
        zfs_close(zhp);
        return (0);
 }
@@ -2395,12 +3463,12 @@ rollback_check(zfs_handle_t *zhp, void *data)
 static int
 zfs_do_rollback(int argc, char **argv)
 {
-       int ret;
+       int ret = 0;
        int c;
        boolean_t force = B_FALSE;
        rollback_cbdata_t cb = { 0 };
        zfs_handle_t *zhp, *snap;
-       char parentname[ZFS_MAXNAMELEN];
+       char parentname[ZFS_MAX_DATASET_NAME_LEN];
        char *delim;
 
        /* check options */
@@ -2457,7 +3525,9 @@ zfs_do_rollback(int argc, char **argv)
        cb.cb_create = zfs_prop_get_int(snap, ZFS_PROP_CREATETXG);
        cb.cb_first = B_TRUE;
        cb.cb_error = 0;
-       if ((ret = zfs_iter_children(zhp, rollback_check, &cb)) != 0)
+       if ((ret = zfs_iter_snapshots(zhp, B_FALSE, rollback_check, &cb)) != 0)
+               goto out;
+       if ((ret = zfs_iter_bookmarks(zhp, rollback_check, &cb)) != 0)
                goto out;
 
        if ((ret = cb.cb_error) != 0)
@@ -2479,21 +3549,17 @@ out:
 }
 
 /*
- * zfs set property=value { fs | snap | vol } ...
+ * zfs set property=value ... { fs | snap | vol } ...
  *
- * Sets the given property for all datasets specified on the command line.
+ * Sets the given properties for all datasets specified on the command line.
  */
-typedef struct set_cbdata {
-       char            *cb_propname;
-       char            *cb_value;
-} set_cbdata_t;
 
 static int
 set_callback(zfs_handle_t *zhp, void *data)
 {
-       set_cbdata_t *cbp = data;
+       nvlist_t *props = data;
 
-       if (zfs_prop_set(zhp, cbp->cb_propname, cbp->cb_value) != 0) {
+       if (zfs_prop_set_list(zhp, props) != 0) {
                switch (libzfs_errno(g_zfs)) {
                case EZFS_MOUNTFAILED:
                        (void) fprintf(stderr, gettext("property may be set "
@@ -2512,8 +3578,10 @@ set_callback(zfs_handle_t *zhp, void *data)
 static int
 zfs_do_set(int argc, char **argv)
 {
-       set_cbdata_t cb;
-       int ret;
+       nvlist_t *props = NULL;
+       int ds_start = -1; /* argv idx of first dataset arg */
+       int ret = 0;
+       int i;
 
        /* check for options */
        if (argc > 1 && argv[1][0] == '-') {
@@ -2524,39 +3592,86 @@ zfs_do_set(int argc, char **argv)
 
        /* check number of arguments */
        if (argc < 2) {
-               (void) fprintf(stderr, gettext("missing property=value "
-                   "argument\n"));
+               (void) fprintf(stderr, gettext("missing arguments\n"));
                usage(B_FALSE);
        }
        if (argc < 3) {
-               (void) fprintf(stderr, gettext("missing dataset name\n"));
+               if (strchr(argv[1], '=') == NULL) {
+                       (void) fprintf(stderr, gettext("missing property=value "
+                           "argument(s)\n"));
+               } else {
+                       (void) fprintf(stderr, gettext("missing dataset "
+                           "name(s)\n"));
+               }
                usage(B_FALSE);
        }
 
-       /* validate property=value argument */
-       cb.cb_propname = argv[1];
-       if (((cb.cb_value = strchr(cb.cb_propname, '=')) == NULL) ||
-           (cb.cb_value[1] == '\0')) {
-               (void) fprintf(stderr, gettext("missing value in "
-                   "property=value argument\n"));
+       /* validate argument order:  prop=val args followed by dataset args */
+       for (i = 1; i < argc; i++) {
+               if (strchr(argv[i], '=') != NULL) {
+                       if (ds_start > 0) {
+                               /* out-of-order prop=val argument */
+                               (void) fprintf(stderr, gettext("invalid "
+                                   "argument order\n"));
+                               usage(B_FALSE);
+                       }
+               } else if (ds_start < 0) {
+                       ds_start = i;
+               }
+       }
+       if (ds_start < 0) {
+               (void) fprintf(stderr, gettext("missing dataset name(s)\n"));
                usage(B_FALSE);
        }
 
-       *cb.cb_value = '\0';
-       cb.cb_value++;
-
-       if (*cb.cb_propname == '\0') {
-               (void) fprintf(stderr,
-                   gettext("missing property in property=value argument\n"));
-               usage(B_FALSE);
+       /* Populate a list of property settings */
+       if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
+               nomem();
+       for (i = 1; i < ds_start; i++) {
+               if ((ret = parseprop(props, argv[i])) != 0)
+                       goto error;
        }
 
-       ret = zfs_for_each(argc - 2, argv + 2, 0,
-           ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb);
+       ret = zfs_for_each(argc - ds_start, argv + ds_start, 0,
+           ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, props);
 
+error:
+       nvlist_free(props);
        return (ret);
 }
 
+typedef struct snap_cbdata {
+       nvlist_t *sd_nvl;
+       boolean_t sd_recursive;
+       const char *sd_snapname;
+} snap_cbdata_t;
+
+static int
+zfs_snapshot_cb(zfs_handle_t *zhp, void *arg)
+{
+       snap_cbdata_t *sd = arg;
+       char *name;
+       int rv = 0;
+       int error;
+
+       if (sd->sd_recursive &&
+           zfs_prop_get_int(zhp, ZFS_PROP_INCONSISTENT) != 0) {
+               zfs_close(zhp);
+               return (0);
+       }
+
+       error = asprintf(&name, "%s@%s", zfs_get_name(zhp), sd->sd_snapname);
+       if (error == -1)
+               nomem();
+       fnvlist_add_boolean(sd->sd_nvl, name);
+       free(name);
+
+       if (sd->sd_recursive)
+               rv = zfs_iter_filesystems(zhp, zfs_snapshot_cb, sd);
+       zfs_close(zhp);
+       return (rv);
+}
+
 /*
  * zfs snapshot [-r] [-o prop=value] ... <fs@snap>
  *
@@ -2566,23 +3681,30 @@ zfs_do_set(int argc, char **argv)
 static int
 zfs_do_snapshot(int argc, char **argv)
 {
-       boolean_t recursive = B_FALSE;
-       int ret;
+       int ret = 0;
        signed char c;
        nvlist_t *props;
+       snap_cbdata_t sd = { 0 };
+       boolean_t multiple_snaps = B_FALSE;
 
        if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
                nomem();
+       if (nvlist_alloc(&sd.sd_nvl, NV_UNIQUE_NAME, 0) != 0)
+               nomem();
 
        /* check options */
        while ((c = getopt(argc, argv, "ro:")) != -1) {
                switch (c) {
                case 'o':
-                       if (parseprop(props))
+                       if (parseprop(props, optarg) != 0) {
+                               nvlist_free(sd.sd_nvl);
+                               nvlist_free(props);
                                return (1);
+                       }
                        break;
                case 'r':
-                       recursive = B_TRUE;
+                       sd.sd_recursive = B_TRUE;
+                       multiple_snaps = B_TRUE;
                        break;
                case '?':
                        (void) fprintf(stderr, gettext("invalid option '%c'\n"),
@@ -2599,27 +3721,41 @@ zfs_do_snapshot(int argc, char **argv)
                (void) fprintf(stderr, gettext("missing snapshot argument\n"));
                goto usage;
        }
-       if (argc > 1) {
-               (void) fprintf(stderr, gettext("too many arguments\n"));
-               goto usage;
+
+       if (argc > 1)
+               multiple_snaps = B_TRUE;
+       for (; argc > 0; argc--, argv++) {
+               char *atp;
+               zfs_handle_t *zhp;
+
+               atp = strchr(argv[0], '@');
+               if (atp == NULL)
+                       goto usage;
+               *atp = '\0';
+               sd.sd_snapname = atp + 1;
+               zhp = zfs_open(g_zfs, argv[0],
+                   ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
+               if (zhp == NULL)
+                       goto usage;
+               if (zfs_snapshot_cb(zhp, &sd) != 0)
+                       goto usage;
        }
 
-       ret = zfs_snapshot(g_zfs, argv[0], recursive, props);
+       ret = zfs_snapshot_nvl(g_zfs, sd.sd_nvl, props);
+       nvlist_free(sd.sd_nvl);
        nvlist_free(props);
-       if (ret && recursive)
+       if (ret != 0 && multiple_snaps)
                (void) fprintf(stderr, gettext("no snapshots were created\n"));
        return (ret != 0);
 
 usage:
+       nvlist_free(sd.sd_nvl);
        nvlist_free(props);
        usage(B_FALSE);
        return (-1);
 }
 
 /*
- * zfs send [-vDp] -R [-i|-I <@snap>] <fs@snap>
- * zfs send [-vDp] [-i|-I <@snap>] <fs@snap>
- *
  * Send a backup stream to stdout.
  */
 static int
@@ -2627,15 +3763,16 @@ zfs_do_send(int argc, char **argv)
 {
        char *fromname = NULL;
        char *toname = NULL;
+       char *resume_token = NULL;
        char *cp;
        zfs_handle_t *zhp;
        sendflags_t flags = { 0 };
        int c, err;
-       nvlist_t *dbgnv;
+       nvlist_t *dbgnv = NULL;
        boolean_t extraverbose = B_FALSE;
 
        /* check options */
-       while ((c = getopt(argc, argv, ":i:I:RDpv")) != -1) {
+       while ((c = getopt(argc, argv, ":i:I:RDpvnPLet:c")) != -1) {
                switch (c) {
                case 'i':
                        if (fromname)
@@ -2654,14 +3791,34 @@ zfs_do_send(int argc, char **argv)
                case 'p':
                        flags.props = B_TRUE;
                        break;
+               case 'P':
+                       flags.parsable = B_TRUE;
+                       flags.verbose = B_TRUE;
+                       break;
                case 'v':
                        if (flags.verbose)
                                extraverbose = B_TRUE;
                        flags.verbose = B_TRUE;
+                       flags.progress = B_TRUE;
                        break;
                case 'D':
                        flags.dedup = B_TRUE;
                        break;
+               case 'n':
+                       flags.dryrun = B_TRUE;
+                       break;
+               case 'L':
+                       flags.largeblock = B_TRUE;
+                       break;
+               case 'e':
+                       flags.embed_data = B_TRUE;
+                       break;
+               case 't':
+                       resume_token = optarg;
+                       break;
+               case 'c':
+                       flags.compress = B_TRUE;
+                       break;
                case ':':
                        (void) fprintf(stderr, gettext("missing argument for "
                            "'%c' option\n"), optopt);
@@ -2677,29 +3834,89 @@ zfs_do_send(int argc, char **argv)
        argc -= optind;
        argv += optind;
 
-       /* check number of arguments */
-       if (argc < 1) {
-               (void) fprintf(stderr, gettext("missing snapshot argument\n"));
-               usage(B_FALSE);
-       }
-       if (argc > 1) {
-               (void) fprintf(stderr, gettext("too many arguments\n"));
-               usage(B_FALSE);
+       if (resume_token != NULL) {
+               if (fromname != NULL || flags.replicate || flags.props ||
+                   flags.dedup) {
+                       (void) fprintf(stderr,
+                           gettext("invalid flags combined with -t\n"));
+                       usage(B_FALSE);
+               }
+               if (argc != 0) {
+                       (void) fprintf(stderr, gettext("no additional "
+                           "arguments are permitted with -t\n"));
+                       usage(B_FALSE);
+               }
+       } else {
+               if (argc < 1) {
+                       (void) fprintf(stderr,
+                           gettext("missing snapshot argument\n"));
+                       usage(B_FALSE);
+               }
+               if (argc > 1) {
+                       (void) fprintf(stderr, gettext("too many arguments\n"));
+                       usage(B_FALSE);
+               }
        }
 
-       if (isatty(STDOUT_FILENO)) {
+       if (!flags.dryrun && isatty(STDOUT_FILENO)) {
                (void) fprintf(stderr,
                    gettext("Error: Stream can not be written to a terminal.\n"
                    "You must redirect standard output.\n"));
                return (1);
        }
 
-       cp = strchr(argv[0], '@');
-       if (cp == NULL) {
-               (void) fprintf(stderr,
-                   gettext("argument must be a snapshot\n"));
-               usage(B_FALSE);
+       if (resume_token != NULL) {
+               return (zfs_send_resume(g_zfs, &flags, STDOUT_FILENO,
+                   resume_token));
+       }
+
+       /*
+        * Special case sending a filesystem, or from a bookmark.
+        */
+       if (strchr(argv[0], '@') == NULL ||
+           (fromname && strchr(fromname, '#') != NULL)) {
+               char frombuf[ZFS_MAX_DATASET_NAME_LEN];
+               enum lzc_send_flags lzc_flags = 0;
+
+               if (flags.replicate || flags.doall || flags.props ||
+                   flags.dedup || flags.dryrun || flags.verbose ||
+                   flags.progress) {
+                       (void) fprintf(stderr,
+                           gettext("Error: "
+                           "Unsupported flag with filesystem or bookmark.\n"));
+                       return (1);
+               }
+
+               zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_DATASET);
+               if (zhp == NULL)
+                       return (1);
+
+               if (flags.largeblock)
+                       lzc_flags |= LZC_SEND_FLAG_LARGE_BLOCK;
+               if (flags.embed_data)
+                       lzc_flags |= LZC_SEND_FLAG_EMBED_DATA;
+               if (flags.compress)
+                       lzc_flags |= LZC_SEND_FLAG_COMPRESS;
+
+               if (fromname != NULL &&
+                   (fromname[0] == '#' || fromname[0] == '@')) {
+                       /*
+                        * Incremental source name begins with # or @.
+                        * Default to same fs as target.
+                        */
+                       (void) strlcpy(frombuf, argv[0], sizeof (frombuf));
+                       cp = strchr(frombuf, '@');
+                       if (cp != NULL)
+                               *cp = '\0';
+                       (void) strlcat(frombuf, fromname, sizeof (frombuf));
+                       fromname = frombuf;
+               }
+               err = zfs_send_one(zhp, fromname, STDOUT_FILENO, lzc_flags);
+               zfs_close(zhp);
+               return (err != 0);
        }
+
+       cp = strchr(argv[0], '@');
        *cp = '\0';
        toname = cp + 1;
        zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
@@ -2712,91 +3929,1496 @@ zfs_do_send(int argc, char **argv)
         * case if they specify the origin.
         */
        if (fromname && (cp = strchr(fromname, '@')) != NULL) {
-               char origin[ZFS_MAXNAMELEN];
+               char origin[ZFS_MAX_DATASET_NAME_LEN];
                zprop_source_t src;
 
-               (void) zfs_prop_get(zhp, ZFS_PROP_ORIGIN,
-                   origin, sizeof (origin), &src, NULL, 0, B_FALSE);
+               (void) zfs_prop_get(zhp, ZFS_PROP_ORIGIN,
+                   origin, sizeof (origin), &src, NULL, 0, B_FALSE);
+
+               if (strcmp(origin, fromname) == 0) {
+                       fromname = NULL;
+                       flags.fromorigin = B_TRUE;
+               } else {
+                       *cp = '\0';
+                       if (cp != fromname && strcmp(argv[0], fromname)) {
+                               (void) fprintf(stderr,
+                                   gettext("incremental source must be "
+                                   "in same filesystem\n"));
+                               usage(B_FALSE);
+                       }
+                       fromname = cp + 1;
+                       if (strchr(fromname, '@') || strchr(fromname, '/')) {
+                               (void) fprintf(stderr,
+                                   gettext("invalid incremental source\n"));
+                               usage(B_FALSE);
+                       }
+               }
+       }
+
+       if (flags.replicate && fromname == NULL)
+               flags.doall = B_TRUE;
+
+       err = zfs_send(zhp, fromname, toname, &flags, STDOUT_FILENO, NULL, 0,
+           extraverbose ? &dbgnv : NULL);
+
+       if (extraverbose && dbgnv != NULL) {
+               /*
+                * dump_nvlist prints to stdout, but that's been
+                * redirected to a file.  Make it print to stderr
+                * instead.
+                */
+               (void) dup2(STDERR_FILENO, STDOUT_FILENO);
+               dump_nvlist(dbgnv, 0);
+               nvlist_free(dbgnv);
+       }
+       zfs_close(zhp);
+
+       return (err != 0);
+}
+
+/*
+ * Restore a backup stream from stdin.
+ */
+static int
+zfs_do_receive(int argc, char **argv)
+{
+       int c, err = 0;
+       recvflags_t flags = { 0 };
+       boolean_t abort_resumable = B_FALSE;
+
+       nvlist_t *props;
+       nvpair_t *nvp = NULL;
+
+       if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
+               nomem();
+
+       /* check options */
+       while ((c = getopt(argc, argv, ":o:denuvFsA")) != -1) {
+               switch (c) {
+               case 'o':
+                       if (parseprop(props, optarg) != 0) {
+                               nvlist_free(props);
+                               return (1);
+                       }
+                       break;
+               case 'd':
+                       flags.isprefix = B_TRUE;
+                       break;
+               case 'e':
+                       flags.isprefix = B_TRUE;
+                       flags.istail = B_TRUE;
+                       break;
+               case 'n':
+                       flags.dryrun = B_TRUE;
+                       break;
+               case 'u':
+                       flags.nomount = B_TRUE;
+                       break;
+               case 'v':
+                       flags.verbose = B_TRUE;
+                       break;
+               case 's':
+                       flags.resumable = B_TRUE;
+                       break;
+               case 'F':
+                       flags.force = B_TRUE;
+                       break;
+               case 'A':
+                       abort_resumable = B_TRUE;
+                       break;
+               case ':':
+                       (void) fprintf(stderr, gettext("missing argument for "
+                           "'%c' option\n"), optopt);
+                       usage(B_FALSE);
+                       break;
+               case '?':
+                       (void) fprintf(stderr, gettext("invalid option '%c'\n"),
+                           optopt);
+                       usage(B_FALSE);
+               }
+       }
+
+       argc -= optind;
+       argv += optind;
+
+       /* check number of arguments */
+       if (argc < 1) {
+               (void) fprintf(stderr, gettext("missing snapshot argument\n"));
+               usage(B_FALSE);
+       }
+       if (argc > 1) {
+               (void) fprintf(stderr, gettext("too many arguments\n"));
+               usage(B_FALSE);
+       }
+
+       while ((nvp = nvlist_next_nvpair(props, nvp))) {
+               if (strcmp(nvpair_name(nvp), "origin") != 0) {
+                       (void) fprintf(stderr, gettext("invalid option"));
+                       usage(B_FALSE);
+               }
+       }
+
+       if (abort_resumable) {
+               if (flags.isprefix || flags.istail || flags.dryrun ||
+                   flags.resumable || flags.nomount) {
+                       (void) fprintf(stderr, gettext("invalid option"));
+                       usage(B_FALSE);
+               }
+
+               char namebuf[ZFS_MAX_DATASET_NAME_LEN];
+               (void) snprintf(namebuf, sizeof (namebuf),
+                   "%s/%%recv", argv[0]);
+
+               if (zfs_dataset_exists(g_zfs, namebuf,
+                   ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME)) {
+                       zfs_handle_t *zhp = zfs_open(g_zfs,
+                           namebuf, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
+                       if (zhp == NULL) {
+                               nvlist_free(props);
+                               return (1);
+                       }
+                       err = zfs_destroy(zhp, B_FALSE);
+                       zfs_close(zhp);
+               } else {
+                       zfs_handle_t *zhp = zfs_open(g_zfs,
+                           argv[0], ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
+                       if (zhp == NULL)
+                               usage(B_FALSE);
+                       if (!zfs_prop_get_int(zhp, ZFS_PROP_INCONSISTENT) ||
+                           zfs_prop_get(zhp, ZFS_PROP_RECEIVE_RESUME_TOKEN,
+                           NULL, 0, NULL, NULL, 0, B_TRUE) == -1) {
+                               (void) fprintf(stderr,
+                                   gettext("'%s' does not have any "
+                                   "resumable receive state to abort\n"),
+                                   argv[0]);
+                               nvlist_free(props);
+                               zfs_close(zhp);
+                               return (1);
+                       }
+                       err = zfs_destroy(zhp, B_FALSE);
+                       zfs_close(zhp);
+               }
+               nvlist_free(props);
+               return (err != 0);
+       }
+
+       if (isatty(STDIN_FILENO)) {
+               (void) fprintf(stderr,
+                   gettext("Error: Backup stream can not be read "
+                   "from a terminal.\n"
+                   "You must redirect standard input.\n"));
+               nvlist_free(props);
+               return (1);
+       }
+       err = zfs_receive(g_zfs, argv[0], props, &flags, STDIN_FILENO, NULL);
+       nvlist_free(props);
+
+       return (err != 0);
+}
+
+/*
+ * allow/unallow stuff
+ */
+/* copied from zfs/sys/dsl_deleg.h */
+#define        ZFS_DELEG_PERM_CREATE           "create"
+#define        ZFS_DELEG_PERM_DESTROY          "destroy"
+#define        ZFS_DELEG_PERM_SNAPSHOT         "snapshot"
+#define        ZFS_DELEG_PERM_ROLLBACK         "rollback"
+#define        ZFS_DELEG_PERM_CLONE            "clone"
+#define        ZFS_DELEG_PERM_PROMOTE          "promote"
+#define        ZFS_DELEG_PERM_RENAME           "rename"
+#define        ZFS_DELEG_PERM_MOUNT            "mount"
+#define        ZFS_DELEG_PERM_SHARE            "share"
+#define        ZFS_DELEG_PERM_SEND             "send"
+#define        ZFS_DELEG_PERM_RECEIVE          "receive"
+#define        ZFS_DELEG_PERM_ALLOW            "allow"
+#define        ZFS_DELEG_PERM_USERPROP         "userprop"
+#define        ZFS_DELEG_PERM_VSCAN            "vscan" /* ??? */
+#define        ZFS_DELEG_PERM_USERQUOTA        "userquota"
+#define        ZFS_DELEG_PERM_GROUPQUOTA       "groupquota"
+#define        ZFS_DELEG_PERM_USERUSED         "userused"
+#define        ZFS_DELEG_PERM_GROUPUSED        "groupused"
+#define        ZFS_DELEG_PERM_USEROBJQUOTA     "userobjquota"
+#define        ZFS_DELEG_PERM_GROUPOBJQUOTA    "groupobjquota"
+#define        ZFS_DELEG_PERM_USEROBJUSED      "userobjused"
+#define        ZFS_DELEG_PERM_GROUPOBJUSED     "groupobjused"
+
+#define        ZFS_DELEG_PERM_HOLD             "hold"
+#define        ZFS_DELEG_PERM_RELEASE          "release"
+#define        ZFS_DELEG_PERM_DIFF             "diff"
+#define        ZFS_DELEG_PERM_BOOKMARK         "bookmark"
+
+#define        ZFS_NUM_DELEG_NOTES ZFS_DELEG_NOTE_NONE
+
+static zfs_deleg_perm_tab_t zfs_deleg_perm_tbl[] = {
+       { ZFS_DELEG_PERM_ALLOW, ZFS_DELEG_NOTE_ALLOW },
+       { ZFS_DELEG_PERM_CLONE, ZFS_DELEG_NOTE_CLONE },
+       { ZFS_DELEG_PERM_CREATE, ZFS_DELEG_NOTE_CREATE },
+       { ZFS_DELEG_PERM_DESTROY, ZFS_DELEG_NOTE_DESTROY },
+       { ZFS_DELEG_PERM_DIFF, ZFS_DELEG_NOTE_DIFF},
+       { ZFS_DELEG_PERM_HOLD, ZFS_DELEG_NOTE_HOLD },
+       { ZFS_DELEG_PERM_MOUNT, ZFS_DELEG_NOTE_MOUNT },
+       { ZFS_DELEG_PERM_PROMOTE, ZFS_DELEG_NOTE_PROMOTE },
+       { ZFS_DELEG_PERM_RECEIVE, ZFS_DELEG_NOTE_RECEIVE },
+       { ZFS_DELEG_PERM_RELEASE, ZFS_DELEG_NOTE_RELEASE },
+       { ZFS_DELEG_PERM_RENAME, ZFS_DELEG_NOTE_RENAME },
+       { ZFS_DELEG_PERM_ROLLBACK, ZFS_DELEG_NOTE_ROLLBACK },
+       { ZFS_DELEG_PERM_SEND, ZFS_DELEG_NOTE_SEND },
+       { ZFS_DELEG_PERM_SHARE, ZFS_DELEG_NOTE_SHARE },
+       { ZFS_DELEG_PERM_SNAPSHOT, ZFS_DELEG_NOTE_SNAPSHOT },
+       { ZFS_DELEG_PERM_BOOKMARK, ZFS_DELEG_NOTE_BOOKMARK },
+
+       { ZFS_DELEG_PERM_GROUPQUOTA, ZFS_DELEG_NOTE_GROUPQUOTA },
+       { ZFS_DELEG_PERM_GROUPUSED, ZFS_DELEG_NOTE_GROUPUSED },
+       { ZFS_DELEG_PERM_USERPROP, ZFS_DELEG_NOTE_USERPROP },
+       { ZFS_DELEG_PERM_USERQUOTA, ZFS_DELEG_NOTE_USERQUOTA },
+       { ZFS_DELEG_PERM_USERUSED, ZFS_DELEG_NOTE_USERUSED },
+       { ZFS_DELEG_PERM_USEROBJQUOTA, ZFS_DELEG_NOTE_USEROBJQUOTA },
+       { ZFS_DELEG_PERM_USEROBJUSED, ZFS_DELEG_NOTE_USEROBJUSED },
+       { ZFS_DELEG_PERM_GROUPOBJQUOTA, ZFS_DELEG_NOTE_GROUPOBJQUOTA },
+       { ZFS_DELEG_PERM_GROUPOBJUSED, ZFS_DELEG_NOTE_GROUPOBJUSED },
+       { NULL, ZFS_DELEG_NOTE_NONE }
+};
+
+/* permission structure */
+typedef struct deleg_perm {
+       zfs_deleg_who_type_t    dp_who_type;
+       const char              *dp_name;
+       boolean_t               dp_local;
+       boolean_t               dp_descend;
+} deleg_perm_t;
+
+/* */
+typedef struct deleg_perm_node {
+       deleg_perm_t            dpn_perm;
+
+       uu_avl_node_t           dpn_avl_node;
+} deleg_perm_node_t;
+
+typedef struct fs_perm fs_perm_t;
+
+/* permissions set */
+typedef struct who_perm {
+       zfs_deleg_who_type_t    who_type;
+       const char              *who_name;              /* id */
+       char                    who_ug_name[256];       /* user/group name */
+       fs_perm_t               *who_fsperm;            /* uplink */
+
+       uu_avl_t                *who_deleg_perm_avl;    /* permissions */
+} who_perm_t;
+
+/* */
+typedef struct who_perm_node {
+       who_perm_t      who_perm;
+       uu_avl_node_t   who_avl_node;
+} who_perm_node_t;
+
+typedef struct fs_perm_set fs_perm_set_t;
+/* fs permissions */
+struct fs_perm {
+       const char              *fsp_name;
+
+       uu_avl_t                *fsp_sc_avl;    /* sets,create */
+       uu_avl_t                *fsp_uge_avl;   /* user,group,everyone */
+
+       fs_perm_set_t           *fsp_set;       /* uplink */
+};
+
+/* */
+typedef struct fs_perm_node {
+       fs_perm_t       fspn_fsperm;
+       uu_avl_t        *fspn_avl;
+
+       uu_list_node_t  fspn_list_node;
+} fs_perm_node_t;
+
+/* top level structure */
+struct fs_perm_set {
+       uu_list_pool_t  *fsps_list_pool;
+       uu_list_t       *fsps_list; /* list of fs_perms */
+
+       uu_avl_pool_t   *fsps_named_set_avl_pool;
+       uu_avl_pool_t   *fsps_who_perm_avl_pool;
+       uu_avl_pool_t   *fsps_deleg_perm_avl_pool;
+};
+
+static inline const char *
+deleg_perm_type(zfs_deleg_note_t note)
+{
+       /* subcommands */
+       switch (note) {
+               /* SUBCOMMANDS */
+               /* OTHER */
+       case ZFS_DELEG_NOTE_GROUPQUOTA:
+       case ZFS_DELEG_NOTE_GROUPUSED:
+       case ZFS_DELEG_NOTE_USERPROP:
+       case ZFS_DELEG_NOTE_USERQUOTA:
+       case ZFS_DELEG_NOTE_USERUSED:
+       case ZFS_DELEG_NOTE_USEROBJQUOTA:
+       case ZFS_DELEG_NOTE_USEROBJUSED:
+       case ZFS_DELEG_NOTE_GROUPOBJQUOTA:
+       case ZFS_DELEG_NOTE_GROUPOBJUSED:
+               /* other */
+               return (gettext("other"));
+       default:
+               return (gettext("subcommand"));
+       }
+}
+
+static int
+who_type2weight(zfs_deleg_who_type_t who_type)
+{
+       int res;
+       switch (who_type) {
+               case ZFS_DELEG_NAMED_SET_SETS:
+               case ZFS_DELEG_NAMED_SET:
+                       res = 0;
+                       break;
+               case ZFS_DELEG_CREATE_SETS:
+               case ZFS_DELEG_CREATE:
+                       res = 1;
+                       break;
+               case ZFS_DELEG_USER_SETS:
+               case ZFS_DELEG_USER:
+                       res = 2;
+                       break;
+               case ZFS_DELEG_GROUP_SETS:
+               case ZFS_DELEG_GROUP:
+                       res = 3;
+                       break;
+               case ZFS_DELEG_EVERYONE_SETS:
+               case ZFS_DELEG_EVERYONE:
+                       res = 4;
+                       break;
+               default:
+                       res = -1;
+       }
+
+       return (res);
+}
+
+/* ARGSUSED */
+static int
+who_perm_compare(const void *larg, const void *rarg, void *unused)
+{
+       const who_perm_node_t *l = larg;
+       const who_perm_node_t *r = rarg;
+       zfs_deleg_who_type_t ltype = l->who_perm.who_type;
+       zfs_deleg_who_type_t rtype = r->who_perm.who_type;
+       int lweight = who_type2weight(ltype);
+       int rweight = who_type2weight(rtype);
+       int res = lweight - rweight;
+       if (res == 0)
+               res = strncmp(l->who_perm.who_name, r->who_perm.who_name,
+                   ZFS_MAX_DELEG_NAME-1);
+
+       if (res == 0)
+               return (0);
+       if (res > 0)
+               return (1);
+       else
+               return (-1);
+}
+
+/* ARGSUSED */
+static int
+deleg_perm_compare(const void *larg, const void *rarg, void *unused)
+{
+       const deleg_perm_node_t *l = larg;
+       const deleg_perm_node_t *r = rarg;
+       int res =  strncmp(l->dpn_perm.dp_name, r->dpn_perm.dp_name,
+           ZFS_MAX_DELEG_NAME-1);
+
+       if (res == 0)
+               return (0);
+
+       if (res > 0)
+               return (1);
+       else
+               return (-1);
+}
+
+static inline void
+fs_perm_set_init(fs_perm_set_t *fspset)
+{
+       bzero(fspset, sizeof (fs_perm_set_t));
+
+       if ((fspset->fsps_list_pool = uu_list_pool_create("fsps_list_pool",
+           sizeof (fs_perm_node_t), offsetof(fs_perm_node_t, fspn_list_node),
+           NULL, UU_DEFAULT)) == NULL)
+               nomem();
+       if ((fspset->fsps_list = uu_list_create(fspset->fsps_list_pool, NULL,
+           UU_DEFAULT)) == NULL)
+               nomem();
+
+       if ((fspset->fsps_named_set_avl_pool = uu_avl_pool_create(
+           "named_set_avl_pool", sizeof (who_perm_node_t), offsetof(
+           who_perm_node_t, who_avl_node), who_perm_compare,
+           UU_DEFAULT)) == NULL)
+               nomem();
+
+       if ((fspset->fsps_who_perm_avl_pool = uu_avl_pool_create(
+           "who_perm_avl_pool", sizeof (who_perm_node_t), offsetof(
+           who_perm_node_t, who_avl_node), who_perm_compare,
+           UU_DEFAULT)) == NULL)
+               nomem();
+
+       if ((fspset->fsps_deleg_perm_avl_pool = uu_avl_pool_create(
+           "deleg_perm_avl_pool", sizeof (deleg_perm_node_t), offsetof(
+           deleg_perm_node_t, dpn_avl_node), deleg_perm_compare, UU_DEFAULT))
+           == NULL)
+               nomem();
+}
+
+static inline void fs_perm_fini(fs_perm_t *);
+static inline void who_perm_fini(who_perm_t *);
+
+static inline void
+fs_perm_set_fini(fs_perm_set_t *fspset)
+{
+       fs_perm_node_t *node = uu_list_first(fspset->fsps_list);
+
+       while (node != NULL) {
+               fs_perm_node_t *next_node =
+                   uu_list_next(fspset->fsps_list, node);
+               fs_perm_t *fsperm = &node->fspn_fsperm;
+               fs_perm_fini(fsperm);
+               uu_list_remove(fspset->fsps_list, node);
+               free(node);
+               node = next_node;
+       }
+
+       uu_avl_pool_destroy(fspset->fsps_named_set_avl_pool);
+       uu_avl_pool_destroy(fspset->fsps_who_perm_avl_pool);
+       uu_avl_pool_destroy(fspset->fsps_deleg_perm_avl_pool);
+}
+
+static inline void
+deleg_perm_init(deleg_perm_t *deleg_perm, zfs_deleg_who_type_t type,
+    const char *name)
+{
+       deleg_perm->dp_who_type = type;
+       deleg_perm->dp_name = name;
+}
+
+static inline void
+who_perm_init(who_perm_t *who_perm, fs_perm_t *fsperm,
+    zfs_deleg_who_type_t type, const char *name)
+{
+       uu_avl_pool_t   *pool;
+       pool = fsperm->fsp_set->fsps_deleg_perm_avl_pool;
+
+       bzero(who_perm, sizeof (who_perm_t));
+
+       if ((who_perm->who_deleg_perm_avl = uu_avl_create(pool, NULL,
+           UU_DEFAULT)) == NULL)
+               nomem();
+
+       who_perm->who_type = type;
+       who_perm->who_name = name;
+       who_perm->who_fsperm = fsperm;
+}
+
+static inline void
+who_perm_fini(who_perm_t *who_perm)
+{
+       deleg_perm_node_t *node = uu_avl_first(who_perm->who_deleg_perm_avl);
+
+       while (node != NULL) {
+               deleg_perm_node_t *next_node =
+                   uu_avl_next(who_perm->who_deleg_perm_avl, node);
+
+               uu_avl_remove(who_perm->who_deleg_perm_avl, node);
+               free(node);
+               node = next_node;
+       }
+
+       uu_avl_destroy(who_perm->who_deleg_perm_avl);
+}
+
+static inline void
+fs_perm_init(fs_perm_t *fsperm, fs_perm_set_t *fspset, const char *fsname)
+{
+       uu_avl_pool_t   *nset_pool = fspset->fsps_named_set_avl_pool;
+       uu_avl_pool_t   *who_pool = fspset->fsps_who_perm_avl_pool;
+
+       bzero(fsperm, sizeof (fs_perm_t));
+
+       if ((fsperm->fsp_sc_avl = uu_avl_create(nset_pool, NULL, UU_DEFAULT))
+           == NULL)
+               nomem();
+
+       if ((fsperm->fsp_uge_avl = uu_avl_create(who_pool, NULL, UU_DEFAULT))
+           == NULL)
+               nomem();
+
+       fsperm->fsp_set = fspset;
+       fsperm->fsp_name = fsname;
+}
+
+static inline void
+fs_perm_fini(fs_perm_t *fsperm)
+{
+       who_perm_node_t *node = uu_avl_first(fsperm->fsp_sc_avl);
+       while (node != NULL) {
+               who_perm_node_t *next_node = uu_avl_next(fsperm->fsp_sc_avl,
+                   node);
+               who_perm_t *who_perm = &node->who_perm;
+               who_perm_fini(who_perm);
+               uu_avl_remove(fsperm->fsp_sc_avl, node);
+               free(node);
+               node = next_node;
+       }
+
+       node = uu_avl_first(fsperm->fsp_uge_avl);
+       while (node != NULL) {
+               who_perm_node_t *next_node = uu_avl_next(fsperm->fsp_uge_avl,
+                   node);
+               who_perm_t *who_perm = &node->who_perm;
+               who_perm_fini(who_perm);
+               uu_avl_remove(fsperm->fsp_uge_avl, node);
+               free(node);
+               node = next_node;
+       }
+
+       uu_avl_destroy(fsperm->fsp_sc_avl);
+       uu_avl_destroy(fsperm->fsp_uge_avl);
+}
+
+static void
+set_deleg_perm_node(uu_avl_t *avl, deleg_perm_node_t *node,
+    zfs_deleg_who_type_t who_type, const char *name, char locality)
+{
+       uu_avl_index_t idx = 0;
+
+       deleg_perm_node_t *found_node = NULL;
+       deleg_perm_t    *deleg_perm = &node->dpn_perm;
+
+       deleg_perm_init(deleg_perm, who_type, name);
+
+       if ((found_node = uu_avl_find(avl, node, NULL, &idx))
+           == NULL)
+               uu_avl_insert(avl, node, idx);
+       else {
+               node = found_node;
+               deleg_perm = &node->dpn_perm;
+       }
+
+
+       switch (locality) {
+       case ZFS_DELEG_LOCAL:
+               deleg_perm->dp_local = B_TRUE;
+               break;
+       case ZFS_DELEG_DESCENDENT:
+               deleg_perm->dp_descend = B_TRUE;
+               break;
+       case ZFS_DELEG_NA:
+               break;
+       default:
+               assert(B_FALSE); /* invalid locality */
+       }
+}
+
+static inline int
+parse_who_perm(who_perm_t *who_perm, nvlist_t *nvl, char locality)
+{
+       nvpair_t *nvp = NULL;
+       fs_perm_set_t *fspset = who_perm->who_fsperm->fsp_set;
+       uu_avl_t *avl = who_perm->who_deleg_perm_avl;
+       zfs_deleg_who_type_t who_type = who_perm->who_type;
+
+       while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) {
+               const char *name = nvpair_name(nvp);
+               data_type_t type = nvpair_type(nvp);
+               uu_avl_pool_t *avl_pool = fspset->fsps_deleg_perm_avl_pool;
+               deleg_perm_node_t *node =
+                   safe_malloc(sizeof (deleg_perm_node_t));
+
+               VERIFY(type == DATA_TYPE_BOOLEAN);
+
+               uu_avl_node_init(node, &node->dpn_avl_node, avl_pool);
+               set_deleg_perm_node(avl, node, who_type, name, locality);
+       }
+
+       return (0);
+}
+
+static inline int
+parse_fs_perm(fs_perm_t *fsperm, nvlist_t *nvl)
+{
+       nvpair_t *nvp = NULL;
+       fs_perm_set_t *fspset = fsperm->fsp_set;
+
+       while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) {
+               nvlist_t *nvl2 = NULL;
+               const char *name = nvpair_name(nvp);
+               uu_avl_t *avl = NULL;
+               uu_avl_pool_t *avl_pool = NULL;
+               zfs_deleg_who_type_t perm_type = name[0];
+               char perm_locality = name[1];
+               const char *perm_name = name + 3;
+               boolean_t is_set = B_TRUE;
+               who_perm_t *who_perm = NULL;
+
+               assert('$' == name[2]);
+
+               if (nvpair_value_nvlist(nvp, &nvl2) != 0)
+                       return (-1);
+
+               switch (perm_type) {
+               case ZFS_DELEG_CREATE:
+               case ZFS_DELEG_CREATE_SETS:
+               case ZFS_DELEG_NAMED_SET:
+               case ZFS_DELEG_NAMED_SET_SETS:
+                       avl_pool = fspset->fsps_named_set_avl_pool;
+                       avl = fsperm->fsp_sc_avl;
+                       break;
+               case ZFS_DELEG_USER:
+               case ZFS_DELEG_USER_SETS:
+               case ZFS_DELEG_GROUP:
+               case ZFS_DELEG_GROUP_SETS:
+               case ZFS_DELEG_EVERYONE:
+               case ZFS_DELEG_EVERYONE_SETS:
+                       avl_pool = fspset->fsps_who_perm_avl_pool;
+                       avl = fsperm->fsp_uge_avl;
+                       break;
+
+               default:
+                       assert(!"unhandled zfs_deleg_who_type_t");
+               }
+
+               if (is_set) {
+                       who_perm_node_t *found_node = NULL;
+                       who_perm_node_t *node = safe_malloc(
+                           sizeof (who_perm_node_t));
+                       who_perm = &node->who_perm;
+                       uu_avl_index_t idx = 0;
+
+                       uu_avl_node_init(node, &node->who_avl_node, avl_pool);
+                       who_perm_init(who_perm, fsperm, perm_type, perm_name);
+
+                       if ((found_node = uu_avl_find(avl, node, NULL, &idx))
+                           == NULL) {
+                               if (avl == fsperm->fsp_uge_avl) {
+                                       uid_t rid = 0;
+                                       struct passwd *p = NULL;
+                                       struct group *g = NULL;
+                                       const char *nice_name = NULL;
+
+                                       switch (perm_type) {
+                                       case ZFS_DELEG_USER_SETS:
+                                       case ZFS_DELEG_USER:
+                                               rid = atoi(perm_name);
+                                               p = getpwuid(rid);
+                                               if (p)
+                                                       nice_name = p->pw_name;
+                                               break;
+                                       case ZFS_DELEG_GROUP_SETS:
+                                       case ZFS_DELEG_GROUP:
+                                               rid = atoi(perm_name);
+                                               g = getgrgid(rid);
+                                               if (g)
+                                                       nice_name = g->gr_name;
+                                               break;
+
+                                       default:
+                                               break;
+                                       }
+
+                                       if (nice_name != NULL)
+                                               (void) strlcpy(
+                                                   node->who_perm.who_ug_name,
+                                                   nice_name, 256);
+                               }
+
+                               uu_avl_insert(avl, node, idx);
+                       } else {
+                               node = found_node;
+                               who_perm = &node->who_perm;
+                       }
+               }
+               VERIFY3P(who_perm, !=, NULL);
+               (void) parse_who_perm(who_perm, nvl2, perm_locality);
+       }
+
+       return (0);
+}
+
+static inline int
+parse_fs_perm_set(fs_perm_set_t *fspset, nvlist_t *nvl)
+{
+       nvpair_t *nvp = NULL;
+       uu_avl_index_t idx = 0;
+
+       while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) {
+               nvlist_t *nvl2 = NULL;
+               const char *fsname = nvpair_name(nvp);
+               data_type_t type = nvpair_type(nvp);
+               fs_perm_t *fsperm = NULL;
+               fs_perm_node_t *node = safe_malloc(sizeof (fs_perm_node_t));
+               if (node == NULL)
+                       nomem();
+
+               fsperm = &node->fspn_fsperm;
+
+               VERIFY(DATA_TYPE_NVLIST == type);
+
+               uu_list_node_init(node, &node->fspn_list_node,
+                   fspset->fsps_list_pool);
+
+               idx = uu_list_numnodes(fspset->fsps_list);
+               fs_perm_init(fsperm, fspset, fsname);
+
+               if (nvpair_value_nvlist(nvp, &nvl2) != 0)
+                       return (-1);
+
+               (void) parse_fs_perm(fsperm, nvl2);
+
+               uu_list_insert(fspset->fsps_list, node, idx);
+       }
+
+       return (0);
+}
+
+static inline const char *
+deleg_perm_comment(zfs_deleg_note_t note)
+{
+       const char *str = "";
+
+       /* subcommands */
+       switch (note) {
+               /* SUBCOMMANDS */
+       case ZFS_DELEG_NOTE_ALLOW:
+               str = gettext("Must also have the permission that is being"
+                   "\n\t\t\t\tallowed");
+               break;
+       case ZFS_DELEG_NOTE_CLONE:
+               str = gettext("Must also have the 'create' ability and 'mount'"
+                   "\n\t\t\t\tability in the origin file system");
+               break;
+       case ZFS_DELEG_NOTE_CREATE:
+               str = gettext("Must also have the 'mount' ability");
+               break;
+       case ZFS_DELEG_NOTE_DESTROY:
+               str = gettext("Must also have the 'mount' ability");
+               break;
+       case ZFS_DELEG_NOTE_DIFF:
+               str = gettext("Allows lookup of paths within a dataset;"
+                   "\n\t\t\t\tgiven an object number. Ordinary users need this"
+                   "\n\t\t\t\tin order to use zfs diff");
+               break;
+       case ZFS_DELEG_NOTE_HOLD:
+               str = gettext("Allows adding a user hold to a snapshot");
+               break;
+       case ZFS_DELEG_NOTE_MOUNT:
+               str = gettext("Allows mount/umount of ZFS datasets");
+               break;
+       case ZFS_DELEG_NOTE_PROMOTE:
+               str = gettext("Must also have the 'mount'\n\t\t\t\tand"
+                   " 'promote' ability in the origin file system");
+               break;
+       case ZFS_DELEG_NOTE_RECEIVE:
+               str = gettext("Must also have the 'mount' and 'create'"
+                   " ability");
+               break;
+       case ZFS_DELEG_NOTE_RELEASE:
+               str = gettext("Allows releasing a user hold which\n\t\t\t\t"
+                   "might destroy the snapshot");
+               break;
+       case ZFS_DELEG_NOTE_RENAME:
+               str = gettext("Must also have the 'mount' and 'create'"
+                   "\n\t\t\t\tability in the new parent");
+               break;
+       case ZFS_DELEG_NOTE_ROLLBACK:
+               str = gettext("");
+               break;
+       case ZFS_DELEG_NOTE_SEND:
+               str = gettext("");
+               break;
+       case ZFS_DELEG_NOTE_SHARE:
+               str = gettext("Allows sharing file systems over NFS or SMB"
+                   "\n\t\t\t\tprotocols");
+               break;
+       case ZFS_DELEG_NOTE_SNAPSHOT:
+               str = gettext("");
+               break;
+/*
+ *     case ZFS_DELEG_NOTE_VSCAN:
+ *             str = gettext("");
+ *             break;
+ */
+               /* OTHER */
+       case ZFS_DELEG_NOTE_GROUPQUOTA:
+               str = gettext("Allows accessing any groupquota@... property");
+               break;
+       case ZFS_DELEG_NOTE_GROUPUSED:
+               str = gettext("Allows reading any groupused@... property");
+               break;
+       case ZFS_DELEG_NOTE_USERPROP:
+               str = gettext("Allows changing any user property");
+               break;
+       case ZFS_DELEG_NOTE_USERQUOTA:
+               str = gettext("Allows accessing any userquota@... property");
+               break;
+       case ZFS_DELEG_NOTE_USERUSED:
+               str = gettext("Allows reading any userused@... property");
+               break;
+       case ZFS_DELEG_NOTE_USEROBJQUOTA:
+               str = gettext("Allows accessing any userobjquota@... property");
+               break;
+       case ZFS_DELEG_NOTE_GROUPOBJQUOTA:
+               str = gettext("Allows accessing any \n\t\t\t\t"
+                   "groupobjquota@... property");
+               break;
+       case ZFS_DELEG_NOTE_GROUPOBJUSED:
+               str = gettext("Allows reading any groupobjused@... property");
+               break;
+       case ZFS_DELEG_NOTE_USEROBJUSED:
+               str = gettext("Allows reading any userobjused@... property");
+               break;
+               /* other */
+       default:
+               str = "";
+       }
+
+       return (str);
+}
+
+struct allow_opts {
+       boolean_t local;
+       boolean_t descend;
+       boolean_t user;
+       boolean_t group;
+       boolean_t everyone;
+       boolean_t create;
+       boolean_t set;
+       boolean_t recursive; /* unallow only */
+       boolean_t prt_usage;
+
+       boolean_t prt_perms;
+       char *who;
+       char *perms;
+       const char *dataset;
+};
+
+static inline int
+prop_cmp(const void *a, const void *b)
+{
+       const char *str1 = *(const char **)a;
+       const char *str2 = *(const char **)b;
+       return (strcmp(str1, str2));
+}
+
+static void
+allow_usage(boolean_t un, boolean_t requested, const char *msg)
+{
+       const char *opt_desc[] = {
+               "-h", gettext("show this help message and exit"),
+               "-l", gettext("set permission locally"),
+               "-d", gettext("set permission for descents"),
+               "-u", gettext("set permission for user"),
+               "-g", gettext("set permission for group"),
+               "-e", gettext("set permission for everyone"),
+               "-c", gettext("set create time permission"),
+               "-s", gettext("define permission set"),
+               /* unallow only */
+               "-r", gettext("remove permissions recursively"),
+       };
+       size_t unallow_size = sizeof (opt_desc) / sizeof (char *);
+       size_t allow_size = unallow_size - 2;
+       const char *props[ZFS_NUM_PROPS];
+       int i;
+       size_t count = 0;
+       FILE *fp = requested ? stdout : stderr;
+       zprop_desc_t *pdtbl = zfs_prop_get_table();
+       const char *fmt = gettext("%-16s %-14s\t%s\n");
+
+       (void) fprintf(fp, gettext("Usage: %s\n"), get_usage(un ? HELP_UNALLOW :
+           HELP_ALLOW));
+       (void) fprintf(fp, gettext("Options:\n"));
+       for (i = 0; i < (un ? unallow_size : allow_size); i += 2) {
+               const char *opt = opt_desc[i];
+               const char *optdsc = opt_desc[i + 1];
+               (void) fprintf(fp, gettext("  %-10s  %s\n"), opt, optdsc);
+       }
+
+       (void) fprintf(fp, gettext("\nThe following permissions are "
+           "supported:\n\n"));
+       (void) fprintf(fp, fmt, gettext("NAME"), gettext("TYPE"),
+           gettext("NOTES"));
+       for (i = 0; i < ZFS_NUM_DELEG_NOTES; i++) {
+               const char *perm_name = zfs_deleg_perm_tbl[i].z_perm;
+               zfs_deleg_note_t perm_note = zfs_deleg_perm_tbl[i].z_note;
+               const char *perm_type = deleg_perm_type(perm_note);
+               const char *perm_comment = deleg_perm_comment(perm_note);
+               (void) fprintf(fp, fmt, perm_name, perm_type, perm_comment);
+       }
+
+       for (i = 0; i < ZFS_NUM_PROPS; i++) {
+               zprop_desc_t *pd = &pdtbl[i];
+               if (pd->pd_visible != B_TRUE)
+                       continue;
+
+               if (pd->pd_attr == PROP_READONLY)
+                       continue;
+
+               props[count++] = pd->pd_name;
+       }
+       props[count] = NULL;
+
+       qsort(props, count, sizeof (char *), prop_cmp);
+
+       for (i = 0; i < count; i++)
+               (void) fprintf(fp, fmt, props[i], gettext("property"), "");
+
+       if (msg != NULL)
+               (void) fprintf(fp, gettext("\nzfs: error: %s"), msg);
+
+       exit(requested ? 0 : 2);
+}
+
+static inline const char *
+munge_args(int argc, char **argv, boolean_t un, size_t expected_argc,
+    char **permsp)
+{
+       if (un && argc == expected_argc - 1)
+               *permsp = NULL;
+       else if (argc == expected_argc)
+               *permsp = argv[argc - 2];
+       else
+               allow_usage(un, B_FALSE,
+                   gettext("wrong number of parameters\n"));
+
+       return (argv[argc - 1]);
+}
+
+static void
+parse_allow_args(int argc, char **argv, boolean_t un, struct allow_opts *opts)
+{
+       int uge_sum = opts->user + opts->group + opts->everyone;
+       int csuge_sum = opts->create + opts->set + uge_sum;
+       int ldcsuge_sum = csuge_sum + opts->local + opts->descend;
+       int all_sum = un ? ldcsuge_sum + opts->recursive : ldcsuge_sum;
+
+       if (uge_sum > 1)
+               allow_usage(un, B_FALSE,
+                   gettext("-u, -g, and -e are mutually exclusive\n"));
+
+       if (opts->prt_usage) {
+               if (argc == 0 && all_sum == 0)
+                       allow_usage(un, B_TRUE, NULL);
+               else
+                       usage(B_FALSE);
+       }
+
+       if (opts->set) {
+               if (csuge_sum > 1)
+                       allow_usage(un, B_FALSE,
+                           gettext("invalid options combined with -s\n"));
+
+               opts->dataset = munge_args(argc, argv, un, 3, &opts->perms);
+               if (argv[0][0] != '@')
+                       allow_usage(un, B_FALSE,
+                           gettext("invalid set name: missing '@' prefix\n"));
+               opts->who = argv[0];
+       } else if (opts->create) {
+               if (ldcsuge_sum > 1)
+                       allow_usage(un, B_FALSE,
+                           gettext("invalid options combined with -c\n"));
+               opts->dataset = munge_args(argc, argv, un, 2, &opts->perms);
+       } else if (opts->everyone) {
+               if (csuge_sum > 1)
+                       allow_usage(un, B_FALSE,
+                           gettext("invalid options combined with -e\n"));
+               opts->dataset = munge_args(argc, argv, un, 2, &opts->perms);
+       } else if (uge_sum == 0 && argc > 0 && strcmp(argv[0], "everyone")
+           == 0) {
+               opts->everyone = B_TRUE;
+               argc--;
+               argv++;
+               opts->dataset = munge_args(argc, argv, un, 2, &opts->perms);
+       } else if (argc == 1 && !un) {
+               opts->prt_perms = B_TRUE;
+               opts->dataset = argv[argc-1];
+       } else {
+               opts->dataset = munge_args(argc, argv, un, 3, &opts->perms);
+               opts->who = argv[0];
+       }
+
+       if (!opts->local && !opts->descend) {
+               opts->local = B_TRUE;
+               opts->descend = B_TRUE;
+       }
+}
+
+static void
+store_allow_perm(zfs_deleg_who_type_t type, boolean_t local, boolean_t descend,
+    const char *who, char *perms, nvlist_t *top_nvl)
+{
+       int i;
+       char ld[2] = { '\0', '\0' };
+       char who_buf[MAXNAMELEN + 32];
+       char base_type = '\0';
+       char set_type = '\0';
+       nvlist_t *base_nvl = NULL;
+       nvlist_t *set_nvl = NULL;
+       nvlist_t *nvl;
+
+       if (nvlist_alloc(&base_nvl, NV_UNIQUE_NAME, 0) != 0)
+               nomem();
+       if (nvlist_alloc(&set_nvl, NV_UNIQUE_NAME, 0) !=  0)
+               nomem();
+
+       switch (type) {
+       case ZFS_DELEG_NAMED_SET_SETS:
+       case ZFS_DELEG_NAMED_SET:
+               set_type = ZFS_DELEG_NAMED_SET_SETS;
+               base_type = ZFS_DELEG_NAMED_SET;
+               ld[0] = ZFS_DELEG_NA;
+               break;
+       case ZFS_DELEG_CREATE_SETS:
+       case ZFS_DELEG_CREATE:
+               set_type = ZFS_DELEG_CREATE_SETS;
+               base_type = ZFS_DELEG_CREATE;
+               ld[0] = ZFS_DELEG_NA;
+               break;
+       case ZFS_DELEG_USER_SETS:
+       case ZFS_DELEG_USER:
+               set_type = ZFS_DELEG_USER_SETS;
+               base_type = ZFS_DELEG_USER;
+               if (local)
+                       ld[0] = ZFS_DELEG_LOCAL;
+               if (descend)
+                       ld[1] = ZFS_DELEG_DESCENDENT;
+               break;
+       case ZFS_DELEG_GROUP_SETS:
+       case ZFS_DELEG_GROUP:
+               set_type = ZFS_DELEG_GROUP_SETS;
+               base_type = ZFS_DELEG_GROUP;
+               if (local)
+                       ld[0] = ZFS_DELEG_LOCAL;
+               if (descend)
+                       ld[1] = ZFS_DELEG_DESCENDENT;
+               break;
+       case ZFS_DELEG_EVERYONE_SETS:
+       case ZFS_DELEG_EVERYONE:
+               set_type = ZFS_DELEG_EVERYONE_SETS;
+               base_type = ZFS_DELEG_EVERYONE;
+               if (local)
+                       ld[0] = ZFS_DELEG_LOCAL;
+               if (descend)
+                       ld[1] = ZFS_DELEG_DESCENDENT;
+               break;
+
+       default:
+               assert(set_type != '\0' && base_type != '\0');
+       }
+
+       if (perms != NULL) {
+               char *curr = perms;
+               char *end = curr + strlen(perms);
+
+               while (curr < end) {
+                       char *delim = strchr(curr, ',');
+                       if (delim == NULL)
+                               delim = end;
+                       else
+                               *delim = '\0';
+
+                       if (curr[0] == '@')
+                               nvl = set_nvl;
+                       else
+                               nvl = base_nvl;
+
+                       (void) nvlist_add_boolean(nvl, curr);
+                       if (delim != end)
+                               *delim = ',';
+                       curr = delim + 1;
+               }
+
+               for (i = 0; i < 2; i++) {
+                       char locality = ld[i];
+                       if (locality == 0)
+                               continue;
+
+                       if (!nvlist_empty(base_nvl)) {
+                               if (who != NULL)
+                                       (void) snprintf(who_buf,
+                                           sizeof (who_buf), "%c%c$%s",
+                                           base_type, locality, who);
+                               else
+                                       (void) snprintf(who_buf,
+                                           sizeof (who_buf), "%c%c$",
+                                           base_type, locality);
+
+                               (void) nvlist_add_nvlist(top_nvl, who_buf,
+                                   base_nvl);
+                       }
+
+
+                       if (!nvlist_empty(set_nvl)) {
+                               if (who != NULL)
+                                       (void) snprintf(who_buf,
+                                           sizeof (who_buf), "%c%c$%s",
+                                           set_type, locality, who);
+                               else
+                                       (void) snprintf(who_buf,
+                                           sizeof (who_buf), "%c%c$",
+                                           set_type, locality);
+
+                               (void) nvlist_add_nvlist(top_nvl, who_buf,
+                                   set_nvl);
+                       }
+               }
+       } else {
+               for (i = 0; i < 2; i++) {
+                       char locality = ld[i];
+                       if (locality == 0)
+                               continue;
+
+                       if (who != NULL)
+                               (void) snprintf(who_buf, sizeof (who_buf),
+                                   "%c%c$%s", base_type, locality, who);
+                       else
+                               (void) snprintf(who_buf, sizeof (who_buf),
+                                   "%c%c$", base_type, locality);
+                       (void) nvlist_add_boolean(top_nvl, who_buf);
+
+                       if (who != NULL)
+                               (void) snprintf(who_buf, sizeof (who_buf),
+                                   "%c%c$%s", set_type, locality, who);
+                       else
+                               (void) snprintf(who_buf, sizeof (who_buf),
+                                   "%c%c$", set_type, locality);
+                       (void) nvlist_add_boolean(top_nvl, who_buf);
+               }
+       }
+}
+
+static int
+construct_fsacl_list(boolean_t un, struct allow_opts *opts, nvlist_t **nvlp)
+{
+       if (nvlist_alloc(nvlp, NV_UNIQUE_NAME, 0) != 0)
+               nomem();
+
+       if (opts->set) {
+               store_allow_perm(ZFS_DELEG_NAMED_SET, opts->local,
+                   opts->descend, opts->who, opts->perms, *nvlp);
+       } else if (opts->create) {
+               store_allow_perm(ZFS_DELEG_CREATE, opts->local,
+                   opts->descend, NULL, opts->perms, *nvlp);
+       } else if (opts->everyone) {
+               store_allow_perm(ZFS_DELEG_EVERYONE, opts->local,
+                   opts->descend, NULL, opts->perms, *nvlp);
+       } else {
+               char *curr = opts->who;
+               char *end = curr + strlen(curr);
+
+               while (curr < end) {
+                       const char *who;
+                       zfs_deleg_who_type_t who_type = ZFS_DELEG_WHO_UNKNOWN;
+                       char *endch;
+                       char *delim = strchr(curr, ',');
+                       char errbuf[256];
+                       char id[64];
+                       struct passwd *p = NULL;
+                       struct group *g = NULL;
+
+                       uid_t rid;
+                       if (delim == NULL)
+                               delim = end;
+                       else
+                               *delim = '\0';
+
+                       rid = (uid_t)strtol(curr, &endch, 0);
+                       if (opts->user) {
+                               who_type = ZFS_DELEG_USER;
+                               if (*endch != '\0')
+                                       p = getpwnam(curr);
+                               else
+                                       p = getpwuid(rid);
+
+                               if (p != NULL)
+                                       rid = p->pw_uid;
+                               else {
+                                       (void) snprintf(errbuf, 256, gettext(
+                                           "invalid user %s"), curr);
+                                       allow_usage(un, B_TRUE, errbuf);
+                               }
+                       } else if (opts->group) {
+                               who_type = ZFS_DELEG_GROUP;
+                               if (*endch != '\0')
+                                       g = getgrnam(curr);
+                               else
+                                       g = getgrgid(rid);
+
+                               if (g != NULL)
+                                       rid = g->gr_gid;
+                               else {
+                                       (void) snprintf(errbuf, 256, gettext(
+                                           "invalid group %s"),  curr);
+                                       allow_usage(un, B_TRUE, errbuf);
+                               }
+                       } else {
+                               if (*endch != '\0') {
+                                       p = getpwnam(curr);
+                               } else {
+                                       p = getpwuid(rid);
+                               }
+
+                               if (p == NULL) {
+                                       if (*endch != '\0') {
+                                               g = getgrnam(curr);
+                                       } else {
+                                               g = getgrgid(rid);
+                                       }
+                               }
+
+                               if (p != NULL) {
+                                       who_type = ZFS_DELEG_USER;
+                                       rid = p->pw_uid;
+                               } else if (g != NULL) {
+                                       who_type = ZFS_DELEG_GROUP;
+                                       rid = g->gr_gid;
+                               } else {
+                                       (void) snprintf(errbuf, 256, gettext(
+                                           "invalid user/group %s"), curr);
+                                       allow_usage(un, B_TRUE, errbuf);
+                               }
+                       }
+
+                       (void) sprintf(id, "%u", rid);
+                       who = id;
+
+                       store_allow_perm(who_type, opts->local,
+                           opts->descend, who, opts->perms, *nvlp);
+                       curr = delim + 1;
+               }
+       }
+
+       return (0);
+}
+
+static void
+print_set_creat_perms(uu_avl_t *who_avl)
+{
+       const char *sc_title[] = {
+               gettext("Permission sets:\n"),
+               gettext("Create time permissions:\n"),
+               NULL
+       };
+       const char **title_ptr = sc_title;
+       who_perm_node_t *who_node = NULL;
+       int prev_weight = -1;
+
+       for (who_node = uu_avl_first(who_avl); who_node != NULL;
+           who_node = uu_avl_next(who_avl, who_node)) {
+               uu_avl_t *avl = who_node->who_perm.who_deleg_perm_avl;
+               zfs_deleg_who_type_t who_type = who_node->who_perm.who_type;
+               const char *who_name = who_node->who_perm.who_name;
+               int weight = who_type2weight(who_type);
+               boolean_t first = B_TRUE;
+               deleg_perm_node_t *deleg_node;
+
+               if (prev_weight != weight) {
+                       (void) printf("%s", *title_ptr++);
+                       prev_weight = weight;
+               }
+
+               if (who_name == NULL || strnlen(who_name, 1) == 0)
+                       (void) printf("\t");
+               else
+                       (void) printf("\t%s ", who_name);
+
+               for (deleg_node = uu_avl_first(avl); deleg_node != NULL;
+                   deleg_node = uu_avl_next(avl, deleg_node)) {
+                       if (first) {
+                               (void) printf("%s",
+                                   deleg_node->dpn_perm.dp_name);
+                               first = B_FALSE;
+                       } else
+                               (void) printf(",%s",
+                                   deleg_node->dpn_perm.dp_name);
+               }
+
+               (void) printf("\n");
+       }
+}
+
+static void
+print_uge_deleg_perms(uu_avl_t *who_avl, boolean_t local, boolean_t descend,
+    const char *title)
+{
+       who_perm_node_t *who_node = NULL;
+       boolean_t prt_title = B_TRUE;
+       uu_avl_walk_t *walk;
+
+       if ((walk = uu_avl_walk_start(who_avl, UU_WALK_ROBUST)) == NULL)
+               nomem();
+
+       while ((who_node = uu_avl_walk_next(walk)) != NULL) {
+               const char *who_name = who_node->who_perm.who_name;
+               const char *nice_who_name = who_node->who_perm.who_ug_name;
+               uu_avl_t *avl = who_node->who_perm.who_deleg_perm_avl;
+               zfs_deleg_who_type_t who_type = who_node->who_perm.who_type;
+               char delim = ' ';
+               deleg_perm_node_t *deleg_node;
+               boolean_t prt_who = B_TRUE;
+
+               for (deleg_node = uu_avl_first(avl);
+                   deleg_node != NULL;
+                   deleg_node = uu_avl_next(avl, deleg_node)) {
+                       if (local != deleg_node->dpn_perm.dp_local ||
+                           descend != deleg_node->dpn_perm.dp_descend)
+                               continue;
 
-               if (strcmp(origin, fromname) == 0) {
-                       fromname = NULL;
-                       flags.fromorigin = B_TRUE;
-               } else {
-                       *cp = '\0';
-                       if (cp != fromname && strcmp(argv[0], fromname)) {
-                               (void) fprintf(stderr,
-                                   gettext("incremental source must be "
-                                   "in same filesystem\n"));
-                               usage(B_FALSE);
-                       }
-                       fromname = cp + 1;
-                       if (strchr(fromname, '@') || strchr(fromname, '/')) {
-                               (void) fprintf(stderr,
-                                   gettext("invalid incremental source\n"));
-                               usage(B_FALSE);
+                       if (prt_who) {
+                               const char *who = NULL;
+                               if (prt_title) {
+                                       prt_title = B_FALSE;
+                                       (void) printf("%s", title);
+                               }
+
+                               switch (who_type) {
+                               case ZFS_DELEG_USER_SETS:
+                               case ZFS_DELEG_USER:
+                                       who = gettext("user");
+                                       if (nice_who_name)
+                                               who_name  = nice_who_name;
+                                       break;
+                               case ZFS_DELEG_GROUP_SETS:
+                               case ZFS_DELEG_GROUP:
+                                       who = gettext("group");
+                                       if (nice_who_name)
+                                               who_name  = nice_who_name;
+                                       break;
+                               case ZFS_DELEG_EVERYONE_SETS:
+                               case ZFS_DELEG_EVERYONE:
+                                       who = gettext("everyone");
+                                       who_name = NULL;
+                                       break;
+
+                               default:
+                                       assert(who != NULL);
+                               }
+
+                               prt_who = B_FALSE;
+                               if (who_name == NULL)
+                                       (void) printf("\t%s", who);
+                               else
+                                       (void) printf("\t%s %s", who, who_name);
                        }
+
+                       (void) printf("%c%s", delim,
+                           deleg_node->dpn_perm.dp_name);
+                       delim = ',';
                }
-       }
 
-       if (flags.replicate && fromname == NULL)
-               flags.doall = B_TRUE;
+               if (!prt_who)
+                       (void) printf("\n");
+       }
 
-       err = zfs_send(zhp, fromname, toname, flags, STDOUT_FILENO, NULL, 0,
-           extraverbose ? &dbgnv : NULL);
+       uu_avl_walk_end(walk);
+}
 
-       if (extraverbose) {
-               /*
-                * dump_nvlist prints to stdout, but that's been
-                * redirected to a file.  Make it print to stderr
-                * instead.
-                */
-               (void) dup2(STDERR_FILENO, STDOUT_FILENO);
-               dump_nvlist(dbgnv, 0);
-               nvlist_free(dbgnv);
+static void
+print_fs_perms(fs_perm_set_t *fspset)
+{
+       fs_perm_node_t *node = NULL;
+       char buf[MAXNAMELEN + 32];
+       const char *dsname = buf;
+
+       for (node = uu_list_first(fspset->fsps_list); node != NULL;
+           node = uu_list_next(fspset->fsps_list, node)) {
+               uu_avl_t *sc_avl = node->fspn_fsperm.fsp_sc_avl;
+               uu_avl_t *uge_avl = node->fspn_fsperm.fsp_uge_avl;
+               int left = 0;
+
+               (void) snprintf(buf, sizeof (buf),
+                   gettext("---- Permissions on %s "),
+                   node->fspn_fsperm.fsp_name);
+               (void) printf("%s", dsname);
+               left = 70 - strlen(buf);
+               while (left-- > 0)
+                       (void) printf("-");
+               (void) printf("\n");
+
+               print_set_creat_perms(sc_avl);
+               print_uge_deleg_perms(uge_avl, B_TRUE, B_FALSE,
+                   gettext("Local permissions:\n"));
+               print_uge_deleg_perms(uge_avl, B_FALSE, B_TRUE,
+                   gettext("Descendent permissions:\n"));
+               print_uge_deleg_perms(uge_avl, B_TRUE, B_TRUE,
+                   gettext("Local+Descendent permissions:\n"));
        }
-       zfs_close(zhp);
+}
 
-       return (err != 0);
+static fs_perm_set_t fs_perm_set = { NULL, NULL, NULL, NULL };
+
+struct deleg_perms {
+       boolean_t un;
+       nvlist_t *nvl;
+};
+
+static int
+set_deleg_perms(zfs_handle_t *zhp, void *data)
+{
+       struct deleg_perms *perms = (struct deleg_perms *)data;
+       zfs_type_t zfs_type = zfs_get_type(zhp);
+
+       if (zfs_type != ZFS_TYPE_FILESYSTEM && zfs_type != ZFS_TYPE_VOLUME)
+               return (0);
+
+       return (zfs_set_fsacl(zhp, perms->un, perms->nvl));
 }
 
-/*
- * zfs receive [-vnFu] [-d | -e] <fs@snap>
- *
- * Restore a backup stream from stdin.
- */
 static int
-zfs_do_receive(int argc, char **argv)
+zfs_do_allow_unallow_impl(int argc, char **argv, boolean_t un)
 {
-       int c, err;
-       recvflags_t flags = { 0 };
+       zfs_handle_t *zhp;
+       nvlist_t *perm_nvl = NULL;
+       nvlist_t *update_perm_nvl = NULL;
+       int error = 1;
+       int c;
+       struct allow_opts opts = { 0 };
 
-       /* check options */
-       while ((c = getopt(argc, argv, ":denuvF")) != -1) {
+       const char *optstr = un ? "ldugecsrh" : "ldugecsh";
+
+       /* check opts */
+       while ((c = getopt(argc, argv, optstr)) != -1) {
                switch (c) {
+               case 'l':
+                       opts.local = B_TRUE;
+                       break;
                case 'd':
-                       flags.isprefix = B_TRUE;
+                       opts.descend = B_TRUE;
                        break;
-               case 'e':
-                       flags.isprefix = B_TRUE;
-                       flags.istail = B_TRUE;
+               case 'u':
+                       opts.user = B_TRUE;
                        break;
-               case 'n':
-                       flags.dryrun = B_TRUE;
+               case 'g':
+                       opts.group = B_TRUE;
                        break;
-               case 'u':
-                       flags.nomount = B_TRUE;
+               case 'e':
+                       opts.everyone = B_TRUE;
                        break;
-               case 'v':
-                       flags.verbose = B_TRUE;
+               case 's':
+                       opts.set = B_TRUE;
                        break;
-               case 'F':
-                       flags.force = B_TRUE;
+               case 'c':
+                       opts.create = B_TRUE;
+                       break;
+               case 'r':
+                       opts.recursive = B_TRUE;
                        break;
                case ':':
                        (void) fprintf(stderr, gettext("missing argument for "
                            "'%c' option\n"), optopt);
                        usage(B_FALSE);
                        break;
+               case 'h':
+                       opts.prt_usage = B_TRUE;
+                       break;
                case '?':
                        (void) fprintf(stderr, gettext("invalid option '%c'\n"),
                            optopt);
@@ -2807,27 +5429,64 @@ zfs_do_receive(int argc, char **argv)
        argc -= optind;
        argv += optind;
 
-       /* check number of arguments */
-       if (argc < 1) {
-               (void) fprintf(stderr, gettext("missing snapshot argument\n"));
-               usage(B_FALSE);
+       /* check arguments */
+       parse_allow_args(argc, argv, un, &opts);
+
+       /* try to open the dataset */
+       if ((zhp = zfs_open(g_zfs, opts.dataset, ZFS_TYPE_FILESYSTEM |
+           ZFS_TYPE_VOLUME)) == NULL) {
+               (void) fprintf(stderr, "Failed to open dataset: %s\n",
+                   opts.dataset);
+               return (-1);
        }
-       if (argc > 1) {
-               (void) fprintf(stderr, gettext("too many arguments\n"));
-               usage(B_FALSE);
+
+       if (zfs_get_fsacl(zhp, &perm_nvl) != 0)
+               goto cleanup2;
+
+       fs_perm_set_init(&fs_perm_set);
+       if (parse_fs_perm_set(&fs_perm_set, perm_nvl) != 0) {
+               (void) fprintf(stderr, "Failed to parse fsacl permissions\n");
+               goto cleanup1;
        }
 
-       if (isatty(STDIN_FILENO)) {
-               (void) fprintf(stderr,
-                   gettext("Error: Backup stream can not be read "
-                   "from a terminal.\n"
-                   "You must redirect standard input.\n"));
-               return (1);
+       if (opts.prt_perms)
+               print_fs_perms(&fs_perm_set);
+       else {
+               (void) construct_fsacl_list(un, &opts, &update_perm_nvl);
+               if (zfs_set_fsacl(zhp, un, update_perm_nvl) != 0)
+                       goto cleanup0;
+
+               if (un && opts.recursive) {
+                       struct deleg_perms data = { un, update_perm_nvl };
+                       if (zfs_iter_filesystems(zhp, set_deleg_perms,
+                           &data) != 0)
+                               goto cleanup0;
+               }
        }
 
-       err = zfs_receive(g_zfs, argv[0], flags, STDIN_FILENO, NULL);
+       error = 0;
 
-       return (err != 0);
+cleanup0:
+       nvlist_free(perm_nvl);
+       nvlist_free(update_perm_nvl);
+cleanup1:
+       fs_perm_set_fini(&fs_perm_set);
+cleanup2:
+       zfs_close(zhp);
+
+       return (error);
+}
+
+static int
+zfs_do_allow(int argc, char **argv)
+{
+       return (zfs_do_allow_unallow_impl(argc, argv, B_FALSE));
+}
+
+static int
+zfs_do_unallow(int argc, char **argv)
+{
+       return (zfs_do_allow_unallow_impl(argc, argv, B_TRUE));
 }
 
 static int
@@ -2837,7 +5496,6 @@ zfs_do_hold_rele_impl(int argc, char **argv, boolean_t holding)
        int i;
        const char *tag;
        boolean_t recursive = B_FALSE;
-       boolean_t temphold = B_FALSE;
        const char *opts = holding ? "rt" : "r";
        int c;
 
@@ -2847,9 +5505,6 @@ zfs_do_hold_rele_impl(int argc, char **argv, boolean_t holding)
                case 'r':
                        recursive = B_TRUE;
                        break;
-               case 't':
-                       temphold = B_TRUE;
-                       break;
                case '?':
                        (void) fprintf(stderr, gettext("invalid option '%c'\n"),
                            optopt);
@@ -2876,7 +5531,7 @@ zfs_do_hold_rele_impl(int argc, char **argv, boolean_t holding)
 
        for (i = 0; i < argc; ++i) {
                zfs_handle_t *zhp;
-               char parent[ZFS_MAXNAMELEN];
+               char parent[ZFS_MAX_DATASET_NAME_LEN];
                const char *delim;
                char *path = argv[i];
 
@@ -2897,8 +5552,7 @@ zfs_do_hold_rele_impl(int argc, char **argv, boolean_t holding)
                        continue;
                }
                if (holding) {
-                       if (zfs_hold(zhp, delim+1, tag, recursive,
-                           temphold, B_FALSE, -1, 0, 0) != 0)
+                       if (zfs_hold(zhp, delim+1, tag, recursive, -1) != 0)
                                ++errors;
                } else {
                        if (zfs_release(zhp, delim+1, tag, recursive) != 0)
@@ -2914,7 +5568,6 @@ zfs_do_hold_rele_impl(int argc, char **argv, boolean_t holding)
  * zfs hold [-r] [-t] <tag> <snap> ...
  *
  *     -r      Recursively hold
- *     -t      Temporary hold (hidden option)
  *
  * Apply a user-hold with the given tag to the list of snapshots.
  */
@@ -2937,6 +5590,200 @@ zfs_do_release(int argc, char **argv)
        return (zfs_do_hold_rele_impl(argc, argv, B_FALSE));
 }
 
+typedef struct holds_cbdata {
+       boolean_t       cb_recursive;
+       const char      *cb_snapname;
+       nvlist_t        **cb_nvlp;
+       size_t          cb_max_namelen;
+       size_t          cb_max_taglen;
+} holds_cbdata_t;
+
+#define        STRFTIME_FMT_STR "%a %b %e %k:%M %Y"
+#define        DATETIME_BUF_LEN (32)
+/*
+ *
+ */
+static void
+print_holds(boolean_t scripted, int nwidth, int tagwidth, nvlist_t *nvl)
+{
+       int i;
+       nvpair_t *nvp = NULL;
+       char *hdr_cols[] = { "NAME", "TAG", "TIMESTAMP" };
+       const char *col;
+
+       if (!scripted) {
+               for (i = 0; i < 3; i++) {
+                       col = gettext(hdr_cols[i]);
+                       if (i < 2)
+                               (void) printf("%-*s  ", i ? tagwidth : nwidth,
+                                   col);
+                       else
+                               (void) printf("%s\n", col);
+               }
+       }
+
+       while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) {
+               char *zname = nvpair_name(nvp);
+               nvlist_t *nvl2;
+               nvpair_t *nvp2 = NULL;
+               (void) nvpair_value_nvlist(nvp, &nvl2);
+               while ((nvp2 = nvlist_next_nvpair(nvl2, nvp2)) != NULL) {
+                       char tsbuf[DATETIME_BUF_LEN];
+                       char *tagname = nvpair_name(nvp2);
+                       uint64_t val = 0;
+                       time_t time;
+                       struct tm t;
+                       char sep = scripted ? '\t' : ' ';
+                       int sepnum = scripted ? 1 : 2;
+
+                       (void) nvpair_value_uint64(nvp2, &val);
+                       time = (time_t)val;
+                       (void) localtime_r(&time, &t);
+                       (void) strftime(tsbuf, DATETIME_BUF_LEN,
+                           gettext(STRFTIME_FMT_STR), &t);
+
+                       (void) printf("%-*s%*c%-*s%*c%s\n", nwidth, zname,
+                           sepnum, sep, tagwidth, tagname, sepnum, sep, tsbuf);
+               }
+       }
+}
+
+/*
+ * Generic callback function to list a dataset or snapshot.
+ */
+static int
+holds_callback(zfs_handle_t *zhp, void *data)
+{
+       holds_cbdata_t *cbp = data;
+       nvlist_t *top_nvl = *cbp->cb_nvlp;
+       nvlist_t *nvl = NULL;
+       nvpair_t *nvp = NULL;
+       const char *zname = zfs_get_name(zhp);
+       size_t znamelen = strlen(zname);
+
+       if (cbp->cb_recursive) {
+               const char *snapname;
+               char *delim  = strchr(zname, '@');
+               if (delim == NULL)
+                       return (0);
+
+               snapname = delim + 1;
+               if (strcmp(cbp->cb_snapname, snapname))
+                       return (0);
+       }
+
+       if (zfs_get_holds(zhp, &nvl) != 0)
+               return (-1);
+
+       if (znamelen > cbp->cb_max_namelen)
+               cbp->cb_max_namelen  = znamelen;
+
+       while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) {
+               const char *tag = nvpair_name(nvp);
+               size_t taglen = strlen(tag);
+               if (taglen > cbp->cb_max_taglen)
+                       cbp->cb_max_taglen  = taglen;
+       }
+
+       return (nvlist_add_nvlist(top_nvl, zname, nvl));
+}
+
+/*
+ * zfs holds [-r] <snap> ...
+ *
+ *     -r      Recursively hold
+ */
+static int
+zfs_do_holds(int argc, char **argv)
+{
+       int errors = 0;
+       int c;
+       int i;
+       boolean_t scripted = B_FALSE;
+       boolean_t recursive = B_FALSE;
+       const char *opts = "rH";
+       nvlist_t *nvl;
+
+       int types = ZFS_TYPE_SNAPSHOT;
+       holds_cbdata_t cb = { 0 };
+
+       int limit = 0;
+       int ret = 0;
+       int flags = 0;
+
+       /* check options */
+       while ((c = getopt(argc, argv, opts)) != -1) {
+               switch (c) {
+               case 'r':
+                       recursive = B_TRUE;
+                       break;
+               case 'H':
+                       scripted = B_TRUE;
+                       break;
+               case '?':
+                       (void) fprintf(stderr, gettext("invalid option '%c'\n"),
+                           optopt);
+                       usage(B_FALSE);
+               }
+       }
+
+       if (recursive) {
+               types |= ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME;
+               flags |= ZFS_ITER_RECURSE;
+       }
+
+       argc -= optind;
+       argv += optind;
+
+       /* check number of arguments */
+       if (argc < 1)
+               usage(B_FALSE);
+
+       if (nvlist_alloc(&nvl, NV_UNIQUE_NAME, 0) != 0)
+               nomem();
+
+       for (i = 0; i < argc; ++i) {
+               char *snapshot = argv[i];
+               const char *delim;
+               const char *snapname;
+
+               delim = strchr(snapshot, '@');
+               if (delim == NULL) {
+                       (void) fprintf(stderr,
+                           gettext("'%s' is not a snapshot\n"), snapshot);
+                       ++errors;
+                       continue;
+               }
+               snapname = delim + 1;
+               if (recursive)
+                       snapshot[delim - snapshot] = '\0';
+
+               cb.cb_recursive = recursive;
+               cb.cb_snapname = snapname;
+               cb.cb_nvlp = &nvl;
+
+               /*
+                *  1. collect holds data, set format options
+                */
+               ret = zfs_for_each(argc, argv, flags, types, NULL, NULL, limit,
+                   holds_callback, &cb);
+               if (ret != 0)
+                       ++errors;
+       }
+
+       /*
+        *  2. print holds data
+        */
+       print_holds(scripted, cb.cb_max_namelen, cb.cb_max_taglen, nvl);
+
+       if (nvlist_empty(nvl))
+               (void) fprintf(stderr, gettext("no datasets available\n"));
+
+       nvlist_free(nvl);
+
+       return (0 != errors);
+}
+
 #define        CHECK_SPINNER 30
 #define        SPINNER_TIME 3          /* seconds */
 #define        MOUNT_TIME 5            /* seconds */
@@ -2963,7 +5810,7 @@ get_one_dataset(zfs_handle_t *zhp, void *data)
        }
 
        /*
-        * Interate over any nested datasets.
+        * Iterate over any nested datasets.
         */
        if (zfs_iter_filesystems(zhp, get_one_dataset, data) != 0) {
                zfs_close(zhp);
@@ -3125,6 +5972,24 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol,
                return (0);
        }
 
+       /*
+        * If this filesystem is inconsistent and has a receive resume
+        * token, we can not mount it.
+        */
+       if (zfs_prop_get_int(zhp, ZFS_PROP_INCONSISTENT) &&
+           zfs_prop_get(zhp, ZFS_PROP_RECEIVE_RESUME_TOKEN,
+           NULL, 0, NULL, NULL, 0, B_TRUE) == 0) {
+               if (!explicit)
+                       return (0);
+
+               (void) fprintf(stderr, gettext("cannot %s '%s': "
+                   "Contains partially-completed state from "
+                   "\"zfs receive -r\", which can be resumed with "
+                   "\"zfs send -t\"\n"),
+                   cmdname, zfs_get_name(zhp));
+               return (1);
+       }
+
        /*
         * At this point, we have verified that the mountpoint and/or
         * shareopts are appropriate for auto management. If the
@@ -3139,10 +6004,10 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol,
                shared_smb = zfs_is_shared_smb(zhp, NULL);
 
                if ((shared_nfs && shared_smb) ||
-                   ((shared_nfs && strcmp(shareopts, "on") == 0) &&
-                   (strcmp(smbshareopts, "off") == 0)) ||
-                   ((shared_smb && strcmp(smbshareopts, "on") == 0) &&
-                   (strcmp(shareopts, "off") == 0))) {
+                   (shared_nfs && strcmp(shareopts, "on") == 0 &&
+                   strcmp(smbshareopts, "off") == 0) ||
+                   (shared_smb && strcmp(smbshareopts, "on") == 0 &&
+                   strcmp(shareopts, "off") == 0)) {
                        if (!explicit)
                                return (0);
 
@@ -3260,7 +6125,7 @@ share_mount(int op, int argc, char **argv)
        int flags = 0;
 
        /* check options */
-       while ((c = getopt(argc, argv, op == OP_MOUNT ? ":avo:" : "a"))
+       while ((c = getopt(argc, argv, op == OP_MOUNT ? ":avo:O" : "a"))
            != -1) {
                switch (c) {
                case 'a':
@@ -3282,7 +6147,9 @@ share_mount(int op, int argc, char **argv)
                        /* option validation is done later */
                        append_options(options, optarg);
                        break;
-
+               case 'O':
+                       flags |= MS_OVERLAY;
+                       break;
                case ':':
                        (void) fprintf(stderr, gettext("missing argument for "
                            "'%c' option\n"), optopt);
@@ -3324,8 +6191,11 @@ share_mount(int op, int argc, char **argv)
                start_progress_timer();
                get_all_datasets(&dslist, &count, verbose);
 
-               if (count == 0)
+               if (count == 0) {
+                       if (options != NULL)
+                               free(options);
                        return (0);
+               }
 
                qsort(dslist, count, sizeof (void *), libzfs_dataset_cmp);
 
@@ -3350,11 +6220,19 @@ share_mount(int op, int argc, char **argv)
                }
 
                /*
-                * When mount is given no arguments, go through /etc/mtab and
-                * display any active ZFS mounts.  We hide any snapshots, since
-                * they are controlled automatically.
+                * When mount is given no arguments, go through
+                * /proc/self/mounts and display any active ZFS mounts.
+                * We hide any snapshots, since they are controlled
+                * automatically.
                 */
-               rewind(mnttab_file);
+
+               /* Reopen MNTTAB to prevent reading stale data from open file */
+               if (freopen(MNTTAB, "r", mnttab_file) == NULL) {
+                       if (options != NULL)
+                               free(options);
+                       return (ENOENT);
+               }
+
                while (getmntent(mnttab_file, &entry) == 0) {
                        if (strcmp(entry.mnt_fstype, MNTTYPE_ZFS) != 0 ||
                            strchr(entry.mnt_special, '@') != NULL)
@@ -3383,6 +6261,9 @@ share_mount(int op, int argc, char **argv)
                }
        }
 
+       if (options != NULL)
+               free(options);
+
        return (ret);
 }
 
@@ -3428,21 +6309,21 @@ unshare_unmount_compare(const void *larg, const void *rarg, void *unused)
 
 /*
  * Convenience routine used by zfs_do_umount() and manual_unmount().  Given an
- * absolute path, find the entry /etc/mtab, verify that its a ZFS filesystem,
- * and unmount it appropriately.
+ * absolute path, find the entry /proc/self/mounts, verify that its a
+ * ZFS filesystems, and unmount it appropriately.
  */
 static int
 unshare_unmount_path(int op, char *path, int flags, boolean_t is_manual)
 {
        zfs_handle_t *zhp;
-       int ret;
+       int ret = 0;
        struct stat64 statbuf;
        struct extmnttab entry;
        const char *cmdname = (op == OP_SHARE) ? "unshare" : "unmount";
        ino_t path_inode;
 
        /*
-        * Search for the path in /etc/mtab.  Rather than looking for the
+        * Search for the path in /proc/self/mounts. Rather than looking for the
         * specific path, which can be fooled by non-standard paths (i.e. ".."
         * or "//"), we stat() the path and search for the corresponding
         * (major,minor) device pair.
@@ -3457,7 +6338,11 @@ unshare_unmount_path(int op, char *path, int flags, boolean_t is_manual)
        /*
         * Search for the given (major,minor) pair in the mount table.
         */
-       rewind(mnttab_file);
+
+       /* Reopen MNTTAB to prevent reading stale data from open file */
+       if (freopen(MNTTAB, "r", mnttab_file) == NULL)
+               return (ENOENT);
+
        while ((ret = getextmntent(mnttab_file, &entry, 0)) == 0) {
                if (entry.mnt_major == major(statbuf.st_dev) &&
                    entry.mnt_minor == minor(statbuf.st_dev))
@@ -3469,8 +6354,8 @@ unshare_unmount_path(int op, char *path, int flags, boolean_t is_manual)
                            "currently mounted\n"), cmdname, path);
                        return (1);
                }
-               (void) fprintf(stderr, gettext("warning: %s not in mtab\n"),
-                   path);
+               (void) fprintf(stderr, gettext("warning: %s not in"
+                   "/proc/self/mounts\n"), path);
                if ((ret = umount2(path, flags)) != 0)
                        (void) fprintf(stderr, gettext("%s: %s\n"), path,
                            strerror(errno));
@@ -3559,7 +6444,7 @@ unshare_unmount(int op, int argc, char **argv)
        char sharesmb[ZFS_MAXPROPLEN];
 
        /* check options */
-       while ((c = getopt(argc, argv, op == OP_SHARE ? "a" : "af")) != -1) {
+       while ((c = getopt(argc, argv, op == OP_SHARE ? ":a" : "af")) != -1) {
                switch (c) {
                case 'a':
                        do_all = 1;
@@ -3567,6 +6452,11 @@ unshare_unmount(int op, int argc, char **argv)
                case 'f':
                        flags = MS_FORCE;
                        break;
+               case ':':
+                       (void) fprintf(stderr, gettext("missing argument for "
+                           "'%c' option\n"), optopt);
+                       usage(B_FALSE);
+                       break;
                case '?':
                        (void) fprintf(stderr, gettext("invalid option '%c'\n"),
                            optopt);
@@ -3581,9 +6471,9 @@ unshare_unmount(int op, int argc, char **argv)
                /*
                 * We could make use of zfs_for_each() to walk all datasets in
                 * the system, but this would be very inefficient, especially
-                * since we would have to linearly search /etc/mtab for each
-                * one.  Instead, do one pass through /etc/mtab looking for
-                * zfs entries and call zfs_unmount() for each one.
+                * since we would have to linearly search /proc/self/mounts for
+                * each one. Instead, do one pass through /proc/self/mounts
+                * looking for zfs entries and call zfs_unmount() for each one.
                 *
                 * Things get a little tricky if the administrator has created
                 * mountpoints beneath other ZFS filesystems.  In this case, we
@@ -3598,6 +6488,19 @@ unshare_unmount(int op, int argc, char **argv)
                unshare_unmount_node_t *node;
                uu_avl_index_t idx;
                uu_avl_walk_t *walk;
+               char *protocol = NULL;
+
+               if (op == OP_SHARE && argc > 0) {
+                       if (strcmp(argv[0], "nfs") != 0 &&
+                           strcmp(argv[0], "smb") != 0) {
+                               (void) fprintf(stderr, gettext("share type "
+                                   "must be 'nfs' or 'smb'\n"));
+                               usage(B_FALSE);
+                       }
+                       protocol = argv[0];
+                       argc--;
+                       argv++;
+               }
 
                if (argc != 0) {
                        (void) fprintf(stderr, gettext("too many arguments\n"));
@@ -3611,7 +6514,10 @@ unshare_unmount(int op, int argc, char **argv)
                    ((tree = uu_avl_create(pool, NULL, UU_DEFAULT)) == NULL))
                        nomem();
 
-               rewind(mnttab_file);
+               /* Reopen MNTTAB to prevent reading stale data from open file */
+               if (freopen(MNTTAB, "r", mnttab_file) == NULL)
+                       return (ENOENT);
+
                while (getmntent(mnttab_file, &entry) == 0) {
 
                        /* ignore non-ZFS entries */
@@ -3687,8 +6593,8 @@ unshare_unmount(int op, int argc, char **argv)
 
                        switch (op) {
                        case OP_SHARE:
-                               if (zfs_unshareall_bypath(node->un_zhp,
-                                   node->un_mountp) != 0)
+                               if (zfs_unshareall_bytype(node->un_zhp,
+                                   node->un_mountp, protocol) != 0)
                                        ret = 1;
                                break;
 
@@ -3818,380 +6724,6 @@ zfs_do_unshare(int argc, char **argv)
        return (unshare_unmount(OP_SHARE, argc, argv));
 }
 
-/* ARGSUSED */
-static int
-zfs_do_python(int argc, char **argv)
-{
-       (void) execv(pypath, argv-1);
-       (void) printf("internal error: %s not found\n", pypath);
-       return (-1);
-}
-
-typedef struct option_map {
-       const char *name;
-       int mask;
-} option_map_t;
-
-static const option_map_t option_map[] = {
-       /* Canonicalized filesystem independent options from mount(8) */
-       { MNTOPT_NOAUTO,        MS_COMMENT      },
-       { MNTOPT_DEFAULTS,      MS_COMMENT      },
-       { MNTOPT_NODEVICES,     MS_NODEV        },
-       { MNTOPT_DIRSYNC,       MS_DIRSYNC      },
-       { MNTOPT_NOEXEC,        MS_NOEXEC       },
-       { MNTOPT_GROUP,         MS_GROUP        },
-       { MNTOPT_NETDEV,        MS_COMMENT      },
-       { MNTOPT_NOFAIL,        MS_COMMENT      },
-       { MNTOPT_NOSUID,        MS_NOSUID       },
-       { MNTOPT_OWNER,         MS_OWNER        },
-       { MNTOPT_REMOUNT,       MS_REMOUNT      },
-       { MNTOPT_RO,            MS_RDONLY       },
-       { MNTOPT_SYNC,          MS_SYNCHRONOUS  },
-       { MNTOPT_USER,          MS_USERS        },
-       { MNTOPT_USERS,         MS_USERS        },
-#ifdef MS_NOATIME
-       { MNTOPT_NOATIME,       MS_NOATIME      },
-#endif
-#ifdef MS_NODIRATIME
-       { MNTOPT_NODIRATIME,    MS_NODIRATIME   },
-#endif
-#ifdef MS_RELATIME
-       { MNTOPT_RELATIME,      MS_RELATIME     },
-#endif
-#ifdef MS_STRICTATIME
-       { MNTOPT_DFRATIME,      MS_STRICTATIME  },
-#endif
-#ifdef HAVE_SELINUX
-       { MNTOPT_CONTEXT,       MS_COMMENT      },
-       { MNTOPT_FSCONTEXT,     MS_COMMENT      },
-       { MNTOPT_DEFCONTEXT,    MS_COMMENT      },
-       { MNTOPT_ROOTCONTEXT,   MS_COMMENT      },
-#endif
-#ifdef MS_I_VERSION
-       { MNTOPT_IVERSION,      MS_I_VERSION    },
-#endif
-#ifdef MS_MANDLOCK
-       { MNTOPT_NBMAND,        MS_MANDLOCK     },
-#endif
-       /* Valid options not found in mount(8) */
-       { MNTOPT_BIND,          MS_BIND         },
-#ifdef MS_REC
-       { MNTOPT_RBIND,         MS_BIND|MS_REC  },
-#endif
-       { MNTOPT_COMMENT,       MS_COMMENT      },
-       { MNTOPT_BOOTWAIT,      MS_COMMENT      },
-       { MNTOPT_NOBOOTWAIT,    MS_COMMENT      },
-       { MNTOPT_OPTIONAL,      MS_COMMENT      },
-       { MNTOPT_SHOWTHROUGH,   MS_COMMENT      },
-#ifdef MS_NOSUB
-       { MNTOPT_NOSUB,         MS_NOSUB        },
-#endif
-#ifdef MS_SILENT
-       { MNTOPT_QUIET,         MS_SILENT       },
-#endif
-       /* Custom zfs options */
-       { MNTOPT_NOXATTR,       MS_COMMENT      },
-       { NULL,                 0               } };
-
-/*
- * Break the mount option in to a name/value pair.  The name is
- * validated against the option map and mount flags set accordingly.
- */
-static int
-parse_option(char *mntopt, unsigned long *mntflags, int sloppy)
-{
-       const option_map_t *opt;
-       char *ptr, *name, *value = NULL;
-       int rc = 0;
-
-       name = strdup(mntopt);
-       if (name == NULL)
-               return (ENOMEM);
-
-       for (ptr = name; ptr && *ptr; ptr++) {
-               if (*ptr == '=') {
-                       *ptr = '\0';
-                       value = ptr+1;
-                       break;
-               }
-       }
-
-       for (opt = option_map; opt->name != NULL; opt++) {
-               if (strncmp(name, opt->name, strlen(name)) == 0) {
-                       *mntflags |= opt->mask;
-
-                       /* MS_USERS implies default user options */
-                       if (opt->mask & (MS_USERS))
-                               *mntflags |= (MS_NOEXEC|MS_NOSUID|MS_NODEV);
-
-                       /* MS_OWNER|MS_GROUP imply default owner options */
-                       if (opt->mask & (MS_OWNER | MS_GROUP))
-                               *mntflags |= (MS_NOSUID|MS_NODEV);
-
-                       rc = 0;
-                       goto out;
-               }
-       }
-
-       if (!sloppy)
-               rc = ENOENT;
-out:
-       /* If required further process on the value may be done here */
-       free(name);
-       return (rc);
-}
-
-/*
- * Translate the mount option string in to MS_* mount flags for the
- * kernel vfs.  When sloppy is non-zero unknown options will be ignored
- * otherwise they are considered fatal are copied in to badopt.
- */
-static int
-parse_options(char *mntopts, unsigned long *mntflags, int sloppy, char *badopt)
-{
-       int rc = 0, quote = 0;
-       char *ptr, *opt, *opts;
-
-       opts = strdup(mntopts);
-       if (opts == NULL)
-               return (ENOMEM);
-
-       *mntflags = 0;
-       opt = NULL;
-
-       /*
-        * Scan through all mount options which must be comma delimited.
-        * We must be careful to notice regions which are double quoted
-        * and skip commas in these regions.  Each option is then checked
-        * to determine if it is a known option.
-        */
-       for (ptr = opts; ptr && *ptr; ptr++) {
-               if (opt == NULL)
-                       opt = ptr;
-
-               if (*ptr == '"')
-                       quote = !quote;
-
-               if (quote)
-                       continue;
-
-               if ((*ptr == ',') || (*ptr == '\0')) {
-                       *ptr = '\0';
-                       rc = parse_option(opt, mntflags, sloppy);
-                       if (rc) {
-                               strcpy(badopt, opt);
-                               goto out;
-                       }
-
-                       opt = NULL;
-               }
-       }
-out:
-       free(opts);
-       return (rc);
-}
-
-/*
- * Called when invoked as /sbin/mount.zfs, mount helper for mount(8).
- */
-static int
-manual_mount(int argc, char **argv)
-{
-       zfs_handle_t *zhp;
-       char legacy[ZFS_MAXPROPLEN];
-       char mntopts[MNT_LINE_MAX] = { '\0' };
-       char badopt[MNT_LINE_MAX] = { '\0' };
-       char *dataset, *mntpoint;
-       unsigned long mntflags;
-       int sloppy = 0, fake = 0, verbose = 0;
-       int rc, c;
-
-       /* check options */
-       while ((c = getopt(argc, argv, "sfnvo:h?")) != -1) {
-               switch (c) {
-               case 's':
-                       sloppy = 1;
-                       break;
-               case 'f':
-                       fake = 1;
-                       break;
-               case 'n':
-                       /* Ignored, handled by mount(8) */
-                       break;
-               case 'v':
-                       verbose++;
-                       break;
-               case 'o':
-                       (void) strlcpy(mntopts, optarg, sizeof (mntopts));
-                       break;
-               case 'h':
-               case '?':
-                       (void) fprintf(stderr, gettext("Invalid option '%c'\n"),
-                           optopt);
-                       (void) fprintf(stderr, gettext("Usage: mount.zfs "
-                           "[-sfnv] [-o options] <dataset> <mountpoint>\n"));
-                       return (MOUNT_USAGE);
-               }
-       }
-
-       argc -= optind;
-       argv += optind;
-
-       /* check that we only have two arguments */
-       if (argc != 2) {
-               if (argc == 0)
-                       (void) fprintf(stderr, gettext("missing dataset "
-                           "argument\n"));
-               else if (argc == 1)
-                       (void) fprintf(stderr,
-                           gettext("missing mountpoint argument\n"));
-               else
-                       (void) fprintf(stderr, gettext("too many arguments\n"));
-               (void) fprintf(stderr, "usage: mount <dataset> <mountpoint>\n");
-               return (MOUNT_USAGE);
-       }
-
-       dataset = argv[0];
-       mntpoint = argv[1];
-
-       /* try to open the dataset to access the mount point */
-       if ((zhp = zfs_open(g_zfs, dataset, ZFS_TYPE_FILESYSTEM)) == NULL) {
-               (void) fprintf(stderr, gettext("filesystem '%s' cannot be "
-                   "mounted, unable to open the dataset\n"), dataset);
-               return (MOUNT_USAGE);
-       }
-
-       (void) zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT, legacy,
-           sizeof (legacy), NULL, NULL, 0, B_FALSE);
-
-       zfs_close(zhp);
-
-       /* check for legacy mountpoint or util mount option */
-       if ((!strcmp(legacy, ZFS_MOUNTPOINT_LEGACY) == 0) &&
-           (strstr(mntopts, MNTOPT_ZFSUTIL) == NULL)) {
-               (void) fprintf(stderr, gettext("filesystem '%s' cannot be "
-                   "mounted using 'mount -a -t zfs'\n"), dataset);
-               (void) fprintf(stderr, gettext("Use 'zfs set mountpoint=%s' "
-                   "instead.\n"), mntpoint);
-               (void) fprintf(stderr, gettext("If you must use 'mount -a -t "
-                   "zfs' or /etc/fstab, use 'zfs set mountpoint=legacy'.\n"));
-               (void) fprintf(stderr, gettext("See zfs(8) for more "
-                   "information.\n"));
-               return (MOUNT_USAGE);
-       }
-
-       /* validate mount options and set mntflags */
-       rc = parse_options(mntopts, &mntflags, sloppy, badopt);
-       if (rc) {
-               switch (rc) {
-               case ENOMEM:
-                       (void) fprintf(stderr, gettext("filesystem '%s' "
-                           "cannot be mounted due to a memory allocation "
-                           "failure\n"), dataset);
-                       return (MOUNT_SYSERR);
-               case EINVAL:
-                       (void) fprintf(stderr, gettext("filesystem '%s' "
-                           "cannot be mounted of due to the invalid option "
-                           "'%s'\n"), dataset, badopt);
-                       (void) fprintf(stderr, gettext("Use the '-s' option "
-                           "to ignore the bad mount option.\n"));
-                       return (MOUNT_USAGE);
-               default:
-                       (void) fprintf(stderr, gettext("filesystem '%s' "
-                           "cannot be mounted due to internal error %d\n"),
-                           dataset, rc);
-                       return (MOUNT_SOFTWARE);
-               }
-       }
-
-       if (verbose > 2)
-               printf("mount.zfs: dataset: \"%s\", mountpoint: \"%s\" "
-                   "mountflags: 0x%lx, mountopts: \"%s\"\n", dataset,
-                   mntpoint, mntflags, mntopts);
-
-       /* load the zfs posix layer module (zpl) */
-       if (libzfs_load_module("zpl")) {
-               (void) fprintf(stderr, gettext("filesystem '%s' cannot be "
-                   "mounted without the zpl kernel module\n"), dataset);
-               (void) fprintf(stderr, gettext("Use 'dmesg' to determine why "
-                   "the module could not be loaded.\n"));
-               return (MOUNT_SYSERR);
-       }
-
-       if (!fake) {
-               rc = mount(dataset, mntpoint, MNTTYPE_ZFS, mntflags, mntopts);
-               if (rc) {
-                       (void) fprintf(stderr, gettext("filesystem '%s' can"
-                           "not be mounted due to error %d\n"), dataset, rc);
-                       return (MOUNT_USAGE);
-               }
-       }
-
-       return (MOUNT_SUCCESS);
-}
-
-#ifdef HAVE_UNMOUNT_HELPER
-/*
- * Called when invoked as /sbin/umount.zfs, mount helper for mount(8).
- * Unlike a manual mount, we allow unmounts of non-legacy filesystems,
- * as this is the dominant administrative interface.
- */
-static int
-manual_unmount(int argc, char **argv)
-{
-       int verbose = 0, flags = 0;
-       int c;
-
-       /* check options */
-       while ((c = getopt(argc, argv, "nlfvrh?")) != -1) {
-               switch (c) {
-               case 'n':
-                       /* Ignored, handled by mount(8) */
-                       break;
-               case 'l':
-                       flags = MS_DETACH;
-                       break;
-               case 'f':
-                       flags = MS_FORCE;
-                       break;
-               case 'v':
-                       verbose++;
-                       break;
-               case 'r':
-                       /* Remount read-only on umount failure, unsupported */
-                       (void) fprintf(stderr, gettext("Unsupported option "
-                           "'%c'\n"), optopt);
-                       return (MOUNT_USAGE);
-               case 'h':
-               case '?':
-                       (void) fprintf(stderr, gettext("Invalid option '%c'\n"),
-                           optopt);
-                       (void) fprintf(stderr, gettext("Usage: umount.zfs "
-                           "[-nlfvr] <mountpoint>\n"));
-                       return (MOUNT_USAGE);
-               }
-       }
-
-       argc -= optind;
-       argv += optind;
-
-       /* check that we only have one argument */
-       if (argc != 1) {
-               if (argc == 0)
-                       (void) fprintf(stderr, gettext("missing mountpoint "
-                           "argument\n"));
-               else
-                       (void) fprintf(stderr, gettext("too many arguments\n"));
-
-               (void) fprintf(stderr, gettext("Usage: umount.zfs [-nlfvr] "
-                   "<mountpoint>\n"));
-               return (MOUNT_USAGE);
-       }
-
-       return (unshare_unmount_path(OP_MOUNT, argv[0], flags, B_TRUE));
-}
-#endif /* HAVE_UNMOUNT_HELPER */
-
 static int
 find_command_idx(char *command, int *idx)
 {
@@ -4217,7 +6749,7 @@ zfs_do_diff(int argc, char **argv)
        char *tosnap = NULL;
        char *fromsnap = NULL;
        char *atp, *copy;
-       int err;
+       int err = 0;
        int c;
 
        while ((c = getopt(argc, argv, "FHt")) != -1) {
@@ -4263,12 +6795,13 @@ zfs_do_diff(int argc, char **argv)
        if (copy == NULL)
                usage(B_FALSE);
 
-       if ((atp = strchr(copy, '@')))
+       if ((atp = strchr(copy, '@')) != NULL)
                *atp = '\0';
 
-       if ((zhp = zfs_open(g_zfs, copy, ZFS_TYPE_FILESYSTEM)) == NULL)
+       if ((zhp = zfs_open(g_zfs, copy, ZFS_TYPE_FILESYSTEM)) == NULL) {
+               free(copy);
                return (1);
-
+       }
        free(copy);
 
        /*
@@ -4284,95 +6817,191 @@ zfs_do_diff(int argc, char **argv)
        return (err != 0);
 }
 
+/*
+ * zfs bookmark <fs@snap> <fs#bmark>
+ *
+ * Creates a bookmark with the given name from the given snapshot.
+ */
+static int
+zfs_do_bookmark(int argc, char **argv)
+{
+       char snapname[ZFS_MAX_DATASET_NAME_LEN];
+       zfs_handle_t *zhp;
+       nvlist_t *nvl;
+       int ret = 0;
+       int c;
+
+       /* check options */
+       while ((c = getopt(argc, argv, "")) != -1) {
+               switch (c) {
+               case '?':
+                       (void) fprintf(stderr,
+                           gettext("invalid option '%c'\n"), optopt);
+                       goto usage;
+               }
+       }
+
+       argc -= optind;
+       argv += optind;
+
+       /* check number of arguments */
+       if (argc < 1) {
+               (void) fprintf(stderr, gettext("missing snapshot argument\n"));
+               goto usage;
+       }
+       if (argc < 2) {
+               (void) fprintf(stderr, gettext("missing bookmark argument\n"));
+               goto usage;
+       }
+
+       if (strchr(argv[1], '#') == NULL) {
+               (void) fprintf(stderr,
+                   gettext("invalid bookmark name '%s' -- "
+                   "must contain a '#'\n"), argv[1]);
+               goto usage;
+       }
+
+       if (argv[0][0] == '@') {
+               /*
+                * Snapshot name begins with @.
+                * Default to same fs as bookmark.
+                */
+               (void) strlcpy(snapname, argv[1], sizeof (snapname));
+               *strchr(snapname, '#') = '\0';
+               (void) strlcat(snapname, argv[0], sizeof (snapname));
+       } else {
+               (void) strlcpy(snapname, argv[0], sizeof (snapname));
+       }
+       zhp = zfs_open(g_zfs, snapname, ZFS_TYPE_SNAPSHOT);
+       if (zhp == NULL)
+               goto usage;
+       zfs_close(zhp);
+
+
+       nvl = fnvlist_alloc();
+       fnvlist_add_string(nvl, argv[1], snapname);
+       ret = lzc_bookmark(nvl, NULL);
+       fnvlist_free(nvl);
+
+       if (ret != 0) {
+               const char *err_msg;
+               char errbuf[1024];
+
+               (void) snprintf(errbuf, sizeof (errbuf),
+                   dgettext(TEXT_DOMAIN,
+                   "cannot create bookmark '%s'"), argv[1]);
+
+               switch (ret) {
+               case EXDEV:
+                       err_msg = "bookmark is in a different pool";
+                       break;
+               case EEXIST:
+                       err_msg = "bookmark exists";
+                       break;
+               case EINVAL:
+                       err_msg = "invalid argument";
+                       break;
+               case ENOTSUP:
+                       err_msg = "bookmark feature not enabled";
+                       break;
+               case ENOSPC:
+                       err_msg = "out of space";
+                       break;
+               default:
+                       err_msg = "unknown error";
+                       break;
+               }
+               (void) fprintf(stderr, "%s: %s\n", errbuf,
+                   dgettext(TEXT_DOMAIN, err_msg));
+       }
+
+       return (ret != 0);
+
+usage:
+       usage(B_FALSE);
+       return (-1);
+}
+
 int
 main(int argc, char **argv)
 {
-       int ret;
+       int ret = 0;
        int i = 0;
-       char *progname;
        char *cmdname;
 
        (void) setlocale(LC_ALL, "");
        (void) textdomain(TEXT_DOMAIN);
 
+       dprintf_setup(&argc, argv);
+
        opterr = 0;
 
-       if ((mnttab_file = fopen(MNTTAB, "r")) == NULL) {
-               (void) fprintf(stderr, gettext("internal error: unable to "
-                   "open %s\n"), MNTTAB);
-               return (1);
+       /*
+        * Make sure the user has specified some command.
+        */
+       if (argc < 2) {
+               (void) fprintf(stderr, gettext("missing command\n"));
+               usage(B_FALSE);
        }
 
+       cmdname = argv[1];
+
        /*
-        * This command also doubles as the /etc/fs mount and unmount program.
-        * Determine if we should take this behavior based on argv[0].
+        * The 'umount' command is an alias for 'unmount'
         */
-       progname = basename(argv[0]);
-       if (strcmp(progname, "mount.zfs") == 0) {
-               ret = manual_mount(argc, argv);
-#ifdef HAVE_UNMOUNT_HELPER
-       } else if (strcmp(progname, "umount.zfs") == 0) {
-               ret = manual_unmount(argc, argv);
-#endif /* HAVE_UNMOUNT_HELPER */
-       } else {
-               /*
-                * Make sure the user has specified some command.
-                */
-               if (argc < 2) {
-                       (void) fprintf(stderr, gettext("missing command\n"));
-                       usage(B_FALSE);
-               }
+       if (strcmp(cmdname, "umount") == 0)
+               cmdname = "unmount";
 
-               cmdname = argv[1];
+       /*
+        * The 'recv' command is an alias for 'receive'
+        */
+       if (strcmp(cmdname, "recv") == 0)
+               cmdname = "receive";
 
-               /*
-                * The 'umount' command is an alias for 'unmount'
-                */
-               if (strcmp(cmdname, "umount") == 0)
-                       cmdname = "unmount";
+       /*
+        * The 'snap' command is an alias for 'snapshot'
+        */
+       if (strcmp(cmdname, "snap") == 0)
+               cmdname = "snapshot";
 
-               /*
-                * The 'recv' command is an alias for 'receive'
-                */
-               if (strcmp(cmdname, "recv") == 0)
-                       cmdname = "receive";
+       /*
+        * Special case '-?'
+        */
+       if ((strcmp(cmdname, "-?") == 0) ||
+           (strcmp(cmdname, "--help") == 0))
+               usage(B_TRUE);
 
-               /*
-                * Special case '-?'
-                */
-               if ((strcmp(cmdname, "-?") == 0) ||
-                   (strcmp(cmdname, "--help") == 0))
-                       usage(B_TRUE);
+       if ((g_zfs = libzfs_init()) == NULL) {
+               (void) fprintf(stderr, "%s", libzfs_error_init(errno));
+               return (1);
+       }
 
-               if ((g_zfs = libzfs_init()) == NULL)
-                       return (1);
+       mnttab_file = g_zfs->libzfs_mnttab;
 
-               zpool_set_history_str("zfs", argc, argv, history_str);
-               verify(zpool_stage_history(g_zfs, history_str) == 0);
+       zfs_save_arguments(argc, argv, history_str, sizeof (history_str));
 
-               libzfs_print_on_error(g_zfs, B_TRUE);
+       libzfs_print_on_error(g_zfs, B_TRUE);
 
-               /*
-                * Run the appropriate command.
-                */
-               libzfs_mnttab_cache(g_zfs, B_TRUE);
-               if (find_command_idx(cmdname, &i) == 0) {
-                       current_command = &command_table[i];
-                       ret = command_table[i].func(argc - 1, argv + 1);
-               } else if (strchr(cmdname, '=') != NULL) {
-                       verify(find_command_idx("set", &i) == 0);
-                       current_command = &command_table[i];
-                       ret = command_table[i].func(argc, argv);
-               } else {
-                       (void) fprintf(stderr, gettext("unrecognized "
-                           "command '%s'\n"), cmdname);
-                       usage(B_FALSE);
-                       ret = 1;
-               }
-               libzfs_mnttab_cache(g_zfs, B_FALSE);
+       /*
+        * Run the appropriate command.
+        */
+       libzfs_mnttab_cache(g_zfs, B_TRUE);
+       if (find_command_idx(cmdname, &i) == 0) {
+               current_command = &command_table[i];
+               ret = command_table[i].func(argc - 1, argv + 1);
+       } else if (strchr(cmdname, '=') != NULL) {
+               verify(find_command_idx("set", &i) == 0);
+               current_command = &command_table[i];
+               ret = command_table[i].func(argc, argv);
+       } else {
+               (void) fprintf(stderr, gettext("unrecognized "
+                   "command '%s'\n"), cmdname);
+               usage(B_FALSE);
+               ret = 1;
        }
 
-       (void) fclose(mnttab_file);
+       if (ret == 0 && log_history)
+               (void) zpool_log_history(g_zfs, history_str);
 
        libzfs_fini(g_zfs);