Illumos #3098 zfs userspace/groupspace fail
[zfs.git] / cmd / zfs / zfs_main.c
index 161a153..cb5c871 100644 (file)
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  */
 
 #include <assert.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <zone.h>
+#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 <sys/mount.h>
 #include <sys/stat.h>
-#include <sys/avl.h>
+#include <sys/fs/zfs.h>
+#include <sys/types.h>
+#include <time.h>
 
 #include <libzfs.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"
 
 libzfs_handle_t *g_zfs;
 
@@ -75,8 +90,13 @@ static int zfs_do_unshare(int argc, char **argv);
 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_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);
 
 /*
  * Enable a reasonable set of defaults for libumem debugging on DEBUG builds.
@@ -116,7 +136,13 @@ typedef enum {
        HELP_UNMOUNT,
        HELP_UNSHARE,
        HELP_ALLOW,
-       HELP_UNALLOW
+       HELP_UNALLOW,
+       HELP_USERSPACE,
+       HELP_GROUPSPACE,
+       HELP_HOLD,
+       HELP_HOLDS,
+       HELP_RELEASE,
+       HELP_DIFF,
 } zfs_help_t;
 
 typedef struct zfs_command {
@@ -147,9 +173,11 @@ static zfs_command_t command_table[] = {
        { "list",       zfs_do_list,            HELP_LIST               },
        { NULL },
        { "set",        zfs_do_set,             HELP_SET                },
-       { "get",        zfs_do_get,             HELP_GET                },
+       { "get",        zfs_do_get,             HELP_GET                },
        { "inherit",    zfs_do_inherit,         HELP_INHERIT            },
        { "upgrade",    zfs_do_upgrade,         HELP_UPGRADE            },
+       { "userspace",  zfs_do_userspace,       HELP_USERSPACE          },
+       { "groupspace", zfs_do_userspace,       HELP_GROUPSPACE         },
        { NULL },
        { "mount",      zfs_do_mount,           HELP_MOUNT              },
        { "unmount",    zfs_do_unmount,         HELP_UNMOUNT            },
@@ -162,6 +190,11 @@ static zfs_command_t command_table[] = {
        { "allow",      zfs_do_allow,           HELP_ALLOW              },
        { NULL },
        { "unallow",    zfs_do_unallow,         HELP_UNALLOW            },
+       { NULL },
+       { "hold",       zfs_do_hold,            HELP_HOLD               },
+       { "holds",      zfs_do_holds,           HELP_HOLDS              },
+       { "release",    zfs_do_release,         HELP_RELEASE            },
+       { "diff",       zfs_do_diff,            HELP_DIFF               },
 };
 
 #define        NCOMMAND        (sizeof (command_table) / sizeof (command_table[0]))
@@ -181,58 +214,62 @@ 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|snapshot>\n"));
+               return (gettext("\tdestroy [-fnpRrv] <filesystem|volume>\n"
+                   "\tdestroy [-dnpRrv] "
+                   "<filesystem|volume>@<snap>[%<snap>][,...]\n"));
        case HELP_GET:
-               return (gettext("\tget [-rHp] [-o field[,...]] "
+               return (gettext("\tget [-rHp] [-d max] "
+                   "[-o \"all\" | field[,...]] [-t type[,...]] "
                    "[-s source[,...]]\n"
                    "\t    <\"all\" | property[,...]> "
                    "[filesystem|volume|snapshot] ...\n"));
        case HELP_INHERIT:
-               return (gettext("\tinherit [-r] <property> "
+               return (gettext("\tinherit [-rS] <property> "
                    "<filesystem|volume|snapshot> ...\n"));
        case HELP_UPGRADE:
                return (gettext("\tupgrade [-v]\n"
                    "\tupgrade [-r] [-V version] <-a | filesystem ...>\n"));
        case HELP_LIST:
-               return (gettext("\tlist [-rH] [-o property[,...]] "
-                   "[-t type[,...]] [-s property] ...\n"
+               return (gettext("\tlist [-rH][-d max] "
+                   "[-o property[,...]] [-t type[,...]] [-s property] ...\n"
                    "\t    [-S property] ... "
-                   "[filesystem|volume|snapshot] ...\n"));
+                   "[filesystem|volume|snapshot|snap] ...\n"));
        case HELP_MOUNT:
                return (gettext("\tmount\n"
                    "\tmount [-vO] [-o opts] <-a | filesystem>\n"));
        case HELP_PROMOTE:
                return (gettext("\tpromote <clone-filesystem>\n"));
        case HELP_RECEIVE:
-               return (gettext("\treceive [-vnF] <filesystem|volume|"
+               return (gettext("\treceive [-vnFu] <filesystem|volume|"
                "snapshot>\n"
-               "\treceive [-vnF] -d <filesystem>\n"));
+               "\treceive [-vnFu] [-d | -e] <filesystem>\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 [-f] -p <filesystem|volume> <filesystem|volume>\n"
                    "\trename -r <snapshot> <snapshot>"));
        case HELP_ROLLBACK:
                return (gettext("\trollback [-rRf] <snapshot>\n"));
        case HELP_SEND:
-               return (gettext("\tsend [-R] [-[iI] snapshot] <snapshot>\n"));
+               return (gettext("\tsend [-DnPpRrv] [-[iI] snapshot] "
+                   "<snapshot>\n"));
        case HELP_SET:
                return (gettext("\tset <property=value> "
                    "<filesystem|volume|snapshot> ...\n"));
        case HELP_SHARE:
                return (gettext("\tshare <-a | filesystem>\n"));
        case HELP_SNAPSHOT:
-               return (gettext("\tsnapshot [-r] [-o property=value] ... "
+               return (gettext("\tsnapshot|snap [-r] [-o property=value] ... "
                    "<filesystem@snapname|volume@snapname>\n"));
        case HELP_UNMOUNT:
                return (gettext("\tunmount [-f] "
                    "<-a | filesystem|mountpoint>\n"));
        case HELP_UNSHARE:
-               return (gettext("\tunshare [-f] "
+               return (gettext("\tunshare "
                    "<-a | filesystem|mountpoint>\n"));
        case HELP_ALLOW:
-               return (gettext("\tallow [-ldug] "
+               return (gettext("\tallow <filesystem|volume>\n"
+                   "\tallow [-ldug] "
                    "<\"everyone\"|user|group>[,...] <perm|@setname>[,...]\n"
                    "\t    <filesystem|volume>\n"
                    "\tallow [-ld] -e <perm|@setname>[,...] "
@@ -250,28 +287,62 @@ get_usage(zfs_help_t idx)
                    "<filesystem|volume>\n"
                    "\tunallow [-r] -s @setname [<perm|@setname>[,...]] "
                    "<filesystem|volume>\n"));
+       case HELP_USERSPACE:
+               return (gettext("\tuserspace [-Hinp] [-o field[,...]] "
+                   "[-s field] ...\n\t[-S field] ... "
+                   "[-t type[,...]] <filesystem|snapshot>\n"));
+       case HELP_GROUPSPACE:
+               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:
+               return (gettext("\tholds [-r] <snapshot> ...\n"));
+       case HELP_RELEASE:
+               return (gettext("\trelease [-r] <tag> <snapshot> ...\n"));
+       case HELP_DIFF:
+               return (gettext("\tdiff [-FHt] <snapshot> "
+                   "[snapshot|filesystem]\n"));
        }
 
        abort();
        /* NOTREACHED */
 }
 
+void
+nomem(void)
+{
+       (void) fprintf(stderr, gettext("internal error: out of memory\n"));
+       exit(1);
+}
+
 /*
  * Utility function to guarantee malloc() success.
  */
+
 void *
 safe_malloc(size_t size)
 {
        void *data;
 
-       if ((data = calloc(1, size)) == NULL) {
-               (void) fprintf(stderr, "internal error: out of memory\n");
-               exit(1);
-       }
+       if ((data = calloc(1, size)) == NULL)
+               nomem();
 
        return (data);
 }
 
+static char *
+safe_strdup(char *str)
+{
+       char *dupstr = strdup(str);
+
+       if (dupstr == NULL)
+               nomem();
+
+       return (dupstr);
+}
+
 /*
  * Callback routine that will print out information for each of
  * the properties.
@@ -311,7 +382,6 @@ usage(boolean_t requested)
 {
        int i;
        boolean_t show_properties = B_FALSE;
-       boolean_t show_permissions = B_FALSE;
        FILE *fp = requested ? stdout : stderr;
 
        if (current_command == NULL) {
@@ -342,13 +412,7 @@ usage(boolean_t requested)
            strcmp(current_command->name, "list") == 0))
                show_properties = B_TRUE;
 
-       if (current_command != NULL &&
-           (strcmp(current_command->name, "allow") == 0 ||
-           strcmp(current_command->name, "unallow") == 0))
-               show_permissions = B_TRUE;
-
        if (show_properties) {
-
                (void) fprintf(fp,
                    gettext("\nThe following properties are supported:\n"));
 
@@ -359,16 +423,28 @@ usage(boolean_t requested)
                (void) zprop_iter(usage_prop_cb, fp, B_FALSE, B_TRUE,
                    ZFS_TYPE_DATASET);
 
+               (void) fprintf(fp, "\t%-15s ", "userused@...");
+               (void) fprintf(fp, " NO       NO   <size>\n");
+               (void) fprintf(fp, "\t%-15s ", "groupused@...");
+               (void) fprintf(fp, " NO       NO   <size>\n");
+               (void) fprintf(fp, "\t%-15s ", "userquota@...");
+               (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"));
                (void) fprintf(fp, gettext("\nUser-defined properties can "
                    "be specified by using a name containing a colon (:).\n"));
-
-       } else if (show_permissions) {
-               (void) fprintf(fp,
-                   gettext("\nThe following permissions are supported:\n"));
-
-               zfs_deleg_permissions();
+               (void) fprintf(fp, gettext("\nThe {user|group}{used|quota}@ "
+                   "properties must be appended with\n"
+                   "a user or group specifier of one of these forms:\n"
+                   "    POSIX name      (eg: \"matt\")\n"
+                   "    POSIX id        (eg: \"126829\")\n"
+                   "    SMB name@domain (eg: \"matt@sun\")\n"
+                   "    SMB SID         (eg: \"S-1-234-567-89\")\n"));
        } else {
                (void) fprintf(fp,
                    gettext("\nFor the property list, run: %s\n"),
@@ -407,14 +483,86 @@ parseprop(nvlist_t *props)
                    "specified multiple times\n"), propname);
                return (-1);
        }
-       if (nvlist_add_string(props, propname, propval) != 0) {
-               (void) fprintf(stderr, gettext("internal "
-                   "error: out of memory\n"));
-               return (-1);
-       }
+       if (nvlist_add_string(props, propname, propval) != 0)
+               nomem();
        return (0);
 }
 
+static int
+parse_depth(char *opt, int *flags)
+{
+       char *tmp;
+       int depth;
+
+       depth = (int)strtol(opt, &tmp, 0);
+       if (*tmp) {
+               (void) fprintf(stderr,
+                   gettext("%s is not an integer\n"), optarg);
+               usage(B_FALSE);
+       }
+       if (depth < 0) {
+               (void) fprintf(stderr,
+                   gettext("Depth can not be negative.\n"));
+               usage(B_FALSE);
+       }
+       *flags |= (ZFS_ITER_DEPTH_LIMIT|ZFS_ITER_RECURSE);
+       return (depth);
+}
+
+#define        PROGRESS_DELAY 2                /* seconds */
+
+static char *pt_reverse = "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b";
+static time_t pt_begin;
+static char *pt_header = NULL;
+static boolean_t pt_shown;
+
+static void
+start_progress_timer(void)
+{
+       pt_begin = time(NULL) + PROGRESS_DELAY;
+       pt_shown = B_FALSE;
+}
+
+static void
+set_progress_header(char *header)
+{
+       assert(pt_header == NULL);
+       pt_header = safe_strdup(header);
+       if (pt_shown) {
+               (void) printf("%s: ", header);
+               (void) fflush(stdout);
+       }
+}
+
+static void
+update_progress(char *update)
+{
+       if (!pt_shown && time(NULL) > pt_begin) {
+               int len = strlen(update);
+
+               (void) printf("%s: %s%*.*s", pt_header, update, len, len,
+                   pt_reverse);
+               (void) fflush(stdout);
+               pt_shown = B_TRUE;
+       } else if (pt_shown) {
+               int len = strlen(update);
+
+               (void) printf("%s%*.*s", update, len, len, pt_reverse);
+               (void) fflush(stdout);
+       }
+}
+
+static void
+finish_progress(char *done)
+{
+       if (pt_shown) {
+               (void) printf("%s\n", done);
+               (void) fflush(stdout);
+       }
+       free(pt_header);
+       pt_header = NULL;
+}
+
 /*
  * zfs clone [-p] [-o prop=value] ... <snap> <fs | vol>
  *
@@ -431,14 +579,11 @@ 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) {
-               (void) fprintf(stderr, gettext("internal error: "
-                   "out of memory\n"));
-               return (1);
-       }
+       if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
+               nomem();
 
        /* check options */
        while ((c = getopt(argc, argv, "o:p")) != -1) {
@@ -503,8 +648,9 @@ zfs_do_clone(int argc, char **argv)
 
                clone = zfs_open(g_zfs, argv[1], ZFS_TYPE_DATASET);
                if (clone != NULL) {
-                       if ((ret = zfs_mount(clone, NULL, 0)) == 0)
-                               ret = zfs_share(clone);
+                       if (zfs_get_type(clone) != ZFS_TYPE_VOLUME)
+                               if ((ret = zfs_mount(clone, NULL, 0)) == 0)
+                                       ret = zfs_share(clone);
                        zfs_close(clone);
                }
        }
@@ -542,7 +688,7 @@ zfs_do_create(int argc, char **argv)
 {
        zfs_type_t type = ZFS_TYPE_FILESYSTEM;
        zfs_handle_t *zhp = NULL;
-       uint64_t volsize;
+       uint64_t volsize = 0;
        int c;
        boolean_t noreserve = B_FALSE;
        boolean_t bflag = B_FALSE;
@@ -550,13 +696,10 @@ zfs_do_create(int argc, char **argv)
        int ret = 1;
        nvlist_t *props;
        uint64_t intval;
-       int canmount;
+       int canmount = ZFS_CANMOUNT_OFF;
 
-       if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) {
-               (void) fprintf(stderr, gettext("internal error: "
-                   "out of memory\n"));
-               return (1);
-       }
+       if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
+               nomem();
 
        /* check options */
        while ((c = getopt(argc, argv, ":V:b:so:p")) != -1) {
@@ -571,12 +714,8 @@ zfs_do_create(int argc, char **argv)
                        }
 
                        if (nvlist_add_uint64(props,
-                           zfs_prop_to_name(ZFS_PROP_VOLSIZE),
-                           intval) != 0) {
-                               (void) fprintf(stderr, gettext("internal "
-                                   "error: out of memory\n"));
-                               goto error;
-                       }
+                           zfs_prop_to_name(ZFS_PROP_VOLSIZE), intval) != 0)
+                               nomem();
                        volsize = intval;
                        break;
                case 'p':
@@ -593,11 +732,8 @@ zfs_do_create(int argc, char **argv)
 
                        if (nvlist_add_uint64(props,
                            zfs_prop_to_name(ZFS_PROP_VOLBLOCKSIZE),
-                           intval) != 0) {
-                               (void) fprintf(stderr, gettext("internal "
-                                   "error: out of memory\n"));
-                               goto error;
-                       }
+                           intval) != 0)
+                               nomem();
                        break;
                case 'o':
                        if (parseprop(props))
@@ -645,7 +781,7 @@ zfs_do_create(int argc, char **argv)
                zfs_prop_t resv_prop;
                char *strval;
 
-               if (p = strchr(argv[0], '/'))
+               if ((p = strchr(argv[0], '/')))
                        *p = '\0';
                zpool_handle = zpool_open(g_zfs, argv[0]);
                if (p != NULL)
@@ -659,15 +795,14 @@ zfs_do_create(int argc, char **argv)
                        resv_prop = ZFS_PROP_REFRESERVATION;
                else
                        resv_prop = ZFS_PROP_RESERVATION;
+               volsize = zvol_volsize_to_reservation(volsize, props);
 
                if (nvlist_lookup_string(props, zfs_prop_to_name(resv_prop),
                    &strval) != 0) {
                        if (nvlist_add_uint64(props,
                            zfs_prop_to_name(resv_prop), volsize) != 0) {
-                               (void) fprintf(stderr, gettext("internal "
-                                   "error: out of memory\n"));
                                nvlist_free(props);
-                               return (1);
+                               nomem();
                        }
                }
        }
@@ -692,19 +827,20 @@ zfs_do_create(int argc, char **argv)
 
        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
         */
-
-       canmount = zfs_prop_get_int(zhp, ZFS_PROP_CANMOUNT);
+       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.
         */
-       ret = 0;
        if (canmount == ZFS_CANMOUNT_ON) {
                if (zfs_mount(zhp, NULL, 0) != 0) {
                        (void) fprintf(stderr, gettext("filesystem "
@@ -729,11 +865,13 @@ badusage:
 }
 
 /*
- * zfs destroy [-rf] <fs, snap, vol>
+ * zfs destroy [-rRf] <fs, vol>
+ * zfs destroy [-rRd] <snap>
  *
- *     -r      Recursively destroy all children
- *     -R      Recursively destroy all dependents, including clones
- *     -f      Force unmounting of any dependents
+ *     -r      Recursively destroy all children
+ *     -R      Recursively destroy all dependents, including clones
+ *     -f      Force unmounting of any dependents
+ *     -d      If we can't destroy now, mark for deferred destruction
  *
  * Destroys the given dataset.  By default, it will unmount any filesystems,
  * and refuse to destroy a dataset that has any dependents.  A dependent can
@@ -741,14 +879,23 @@ 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;
+
+       /* first snap in contiguous run */
+       zfs_handle_t    *cb_firstsnap;
+       /* previous snap in contiguous run */
+       zfs_handle_t    *cb_prevsnap;
+       int64_t         cb_snapused;
+       char            *cb_snapspec;
 } destroy_cbdata_t;
 
 /*
@@ -778,7 +925,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));
@@ -799,7 +946,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));
@@ -813,11 +961,24 @@ 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
-        * here.
+        * here).
         */
        if (strchr(zfs_get_name(zhp), '/') == NULL &&
            zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) {
@@ -825,13 +986,12 @@ destroy_callback(zfs_handle_t *zhp, void *data)
                return (0);
        }
 
-       /*
-        * Bail out on the first error.
-        */
-       if (zfs_unmount(zhp, NULL, cbp->cb_force ? MS_FORCE : 0) != 0 ||
-           zfs_destroy(zhp) != 0) {
-               zfs_close(zhp);
-               return (-1);
+       if (!cb->cb_dryrun) {
+               if (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);
@@ -839,39 +999,142 @@ 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 = zfs_handle_dup(zhp);
+               if (cb->cb_prevsnap != NULL)
+                       zfs_close(cb->cb_prevsnap);
+               /* this snap continues the current range */
+               cb->cb_prevsnap = zfs_handle_dup(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);
+                       }
+               }
+       } else if (cb->cb_firstsnap != NULL) {
+               /* end of this range */
+               uint64_t used = 0;
+               err = zfs_get_snapused_int(cb->cb_firstsnap,
+                   cb->cb_prevsnap, &used);
+               cb->cb_snapused += used;
+               zfs_close(cb->cb_firstsnap);
+               cb->cb_firstsnap = NULL;
+               zfs_close(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 = zfs_get_snapused_int(cb->cb_firstsnap,
+                           cb->cb_prevsnap, &used);
                }
-               zfs_close(szhp);
+               cb->cb_snapused += used;
+               zfs_close(cb->cb_firstsnap);
+               cb->cb_firstsnap = NULL;
+               zfs_close(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
@@ -880,20 +1143,35 @@ zfs_do_destroy(int argc, char **argv)
        destroy_cbdata_t cb = { 0 };
        int c;
        zfs_handle_t *zhp;
-       char *cp;
+       char *at;
+       zfs_type_t type = ZFS_TYPE_DATASET;
 
        /* check options */
-       while ((c = getopt(argc, argv, "frR")) != -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:
@@ -908,7 +1186,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) {
@@ -916,101 +1194,147 @@ 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], '@');
+       if (at != NULL) {
+               int err = 0;
 
-               *cp = '\0';
-               if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_DATASET)) == NULL)
+               /* Build the list of snaps to destroy in cb_nvl. */
+               if (nvlist_alloc(&cb.cb_nvl, NV_UNIQUE_NAME, 0) != 0)
+                       nomem();
+
+               *at = '\0';
+               zhp = zfs_open(g_zfs, argv[0],
+                   ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
+               if (zhp == NULL)
                        return (1);
-               *cp = '@';
-               cp++;
 
-               if (cb.cb_doclones) {
-                       cb.cb_snapname = cp;
-                       if (destroy_snap_clones(zhp, &cb) != 0) {
-                               zfs_close(zhp);
-                               return (1);
-                       }
+               cb.cb_snapspec = at + 1;
+               if (gather_snapshots(zfs_handle_dup(zhp), &cb) != 0 ||
+                   cb.cb_error) {
+                       zfs_close(zhp);
+                       nvlist_free(cb.cb_nvl);
+                       return (1);
                }
 
-               ret = zfs_destroy_snaps(zhp, cp);
-               zfs_close(zhp);
-               if (ret) {
-                       (void) fprintf(stderr,
-                           gettext("no snapshots destroyed\n"));
+               if (nvlist_empty(cb.cb_nvl)) {
+                       (void) fprintf(stderr, gettext("could not find any "
+                           "snapshots to destroy; check snapshot names.\n"));
+                       zfs_close(zhp);
+                       nvlist_free(cb.cb_nvl);
+                       return (1);
                }
-               return (ret != 0);
-       }
-
 
-       /* Open the given dataset */
-       if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_DATASET)) == NULL)
-               return (1);
+               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_target = zhp;
+               if (!cb.cb_dryrun) {
+                       if (cb.cb_doclones)
+                               err = destroy_clones(&cb);
+                       if (err == 0) {
+                               err = zfs_destroy_snaps_nvl(zhp, cb.cb_nvl,
+                                   cb.cb_defer_destroy);
+                       }
+               }
 
-       /*
-        * 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);
-       }
+               nvlist_free(cb.cb_nvl);
+               if (err != 0)
+                       return (1);
+       } else {
+               /* Open the given dataset */
+               if ((zhp = zfs_open(g_zfs, argv[0], type)) == NULL)
+                       return (1);
 
-       /*
-        * 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) {
-               zfs_close(zhp);
-               return (1);
-       }
+               cb.cb_target = zhp;
 
-       if (cb.cb_error ||
-           zfs_iter_dependents(zhp, B_FALSE, destroy_callback, &cb) != 0) {
-               zfs_close(zhp);
-               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);
+               }
 
-       /*
-        * Do the real thing.  The callback will close the handle regardless of
-        * whether it succeeds or not.
-        */
+               /*
+                * 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) {
+                       zfs_close(zhp);
+                       return (1);
+               }
 
-       if (destroy_callback(zhp, &cb) != 0)
-               return (1);
+               if (cb.cb_error) {
+                       zfs_close(zhp);
+                       return (1);
+               }
+
+               if (zfs_iter_dependents(zhp, B_FALSE, destroy_callback,
+                   &cb) != 0) {
+                       zfs_close(zhp);
+                       return (1);
+               }
 
+               /*
+                * Do the real thing.  The callback will close the
+                * handle regardless of whether it succeeds or not.
+                */
+               if (destroy_callback(zhp, &cb) != 0)
+                       return (1);
+       }
 
        return (0);
 }
 
+static boolean_t
+is_recvd_column(zprop_get_cbdata_t *cbp)
+{
+       int i;
+       zfs_get_column_t col;
+
+       for (i = 0; i < ZFS_GET_NCOLS &&
+           (col = cbp->cb_columns[i]) != GET_COL_NONE; i++)
+               if (col == GET_COL_RECVD)
+                       return (B_TRUE);
+       return (B_FALSE);
+}
+
 /*
- * zfs get [-rHp] [-o field[,field]...] [-s source[,source]...]
- *     < all | property[,property]... > < fs | snap | vol > ...
+ * zfs get [-rHp] [-o all | field[,field]...] [-s source[,source]...]
+ *     < all | property[,property]... > < fs | snap | vol > ...
  *
  *     -r      recurse over any child datasets
  *     -H      scripted mode.  Headers are stripped, and fields are separated
  *             by tabs instead of spaces.
- *     -o      Set of fields to display.  One of "name,property,value,source".
- *             Default is all four.
+ *     -o      Set of fields to display.  One of "name,property,value,
+ *             received,source". Default is "name,property,value,source".
+ *             "all" is an alias for all five.
  *     -s      Set of sources to allow.  One of
- *             "local,default,inherited,temporary,none".  Default is all
- *             five.
+ *             "local,default,inherited,received,temporary,none".  Default is
+ *             all six.
  *     -p      Display values in parsable (literal) format.
  *
  *  Prints properties for the given datasets.  The user can control which
@@ -1024,16 +1348,19 @@ static int
 get_callback(zfs_handle_t *zhp, void *data)
 {
        char buf[ZFS_MAXPROPLEN];
+       char rbuf[ZFS_MAXPROPLEN];
        zprop_source_t sourcetype;
        char source[ZFS_MAXNAMELEN];
        zprop_get_cbdata_t *cbp = data;
-       nvlist_t *userprop = zfs_get_user_props(zhp);
+       nvlist_t *user_props = zfs_get_user_props(zhp);
        zprop_list_t *pl = cbp->cb_proplist;
        nvlist_t *propval;
        char *strval;
        char *sourceval;
+       boolean_t received = is_recvd_column(cbp);
 
        for (; pl != NULL; pl = pl->pl_next) {
+               char *recvdval = NULL;
                /*
                 * Skip the special fake placeholder.  This will also skip over
                 * the name property when 'all' is specified.
@@ -1060,11 +1387,38 @@ get_callback(zfs_handle_t *zhp, void *data)
                                (void) strlcpy(buf, "-", sizeof (buf));
                        }
 
+                       if (received && (zfs_prop_get_recvd(zhp,
+                           zfs_prop_to_name(pl->pl_prop), rbuf, sizeof (rbuf),
+                           cbp->cb_literal) == 0))
+                               recvdval = rbuf;
+
                        zprop_print_one_property(zfs_get_name(zhp), cbp,
                            zfs_prop_to_name(pl->pl_prop),
-                           buf, sourcetype, source);
+                           buf, sourcetype, source, recvdval);
+               } else if (zfs_prop_userquota(pl->pl_user_prop)) {
+                       sourcetype = ZPROP_SRC_LOCAL;
+
+                       if (zfs_prop_get_userquota(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 (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(userprop,
+                       if (nvlist_lookup_nvlist(user_props,
                            pl->pl_user_prop, &propval) != 0) {
                                if (pl->pl_all)
                                        continue;
@@ -1079,6 +1433,9 @@ get_callback(zfs_handle_t *zhp, void *data)
                                if (strcmp(sourceval,
                                    zfs_get_name(zhp)) == 0) {
                                        sourcetype = ZPROP_SRC_LOCAL;
+                               } else if (strcmp(sourceval,
+                                   ZPROP_SOURCE_VAL_RECVD) == 0) {
+                                       sourcetype = ZPROP_SRC_RECEIVED;
                                } else {
                                        sourcetype = ZPROP_SRC_INHERITED;
                                        (void) strlcpy(source,
@@ -1086,9 +1443,14 @@ get_callback(zfs_handle_t *zhp, void *data)
                                }
                        }
 
+                       if (received && (zfs_prop_get_recvd(zhp,
+                           pl->pl_user_prop, rbuf, sizeof (rbuf),
+                           cbp->cb_literal) == 0))
+                               recvdval = rbuf;
+
                        zprop_print_one_property(zfs_get_name(zhp), cbp,
                            pl->pl_user_prop, strval, sourcetype,
-                           source);
+                           source, recvdval);
                }
        }
 
@@ -1099,9 +1461,11 @@ 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 };
 
        /*
@@ -1115,11 +1479,14 @@ zfs_do_get(int argc, char **argv)
        cb.cb_type = ZFS_TYPE_DATASET;
 
        /* check options */
-       while ((c = getopt(argc, argv, ":o:s:rHp")) != -1) {
+       while ((c = getopt(argc, argv, ":d:o:s:rt:Hp")) != -1) {
                switch (c) {
                case 'p':
                        cb.cb_literal = B_TRUE;
                        break;
+               case 'd':
+                       limit = parse_depth(optarg, &flags);
+                       break;
                case 'r':
                        flags |= ZFS_ITER_RECURSE;
                        break;
@@ -1140,10 +1507,10 @@ zfs_do_get(int argc, char **argv)
                        i = 0;
                        while (*optarg != '\0') {
                                static char *col_subopts[] =
-                                   { "name", "property", "value", "source",
-                                   NULL };
+                                   { "name", "property", "value", "received",
+                                   "source", "all", NULL };
 
-                               if (i == 4) {
+                               if (i == ZFS_GET_NCOLS) {
                                        (void) fprintf(stderr, gettext("too "
                                            "many fields given to -o "
                                            "option\n"));
@@ -1162,8 +1529,28 @@ zfs_do_get(int argc, char **argv)
                                        cb.cb_columns[i++] = GET_COL_VALUE;
                                        break;
                                case 3:
+                                       cb.cb_columns[i++] = GET_COL_RECVD;
+                                       flags |= ZFS_ITER_RECVD_PROPS;
+                                       break;
+                               case 4:
                                        cb.cb_columns[i++] = GET_COL_SOURCE;
                                        break;
+                               case 5:
+                                       if (i > 0) {
+                                               (void) fprintf(stderr,
+                                                   gettext("\"all\" conflicts "
+                                                   "with specific fields "
+                                                   "given to -o option\n"));
+                                               usage(B_FALSE);
+                                       }
+                                       cb.cb_columns[0] = GET_COL_NAME;
+                                       cb.cb_columns[1] = GET_COL_PROPERTY;
+                                       cb.cb_columns[2] = GET_COL_VALUE;
+                                       cb.cb_columns[3] = GET_COL_RECVD;
+                                       cb.cb_columns[4] = GET_COL_SOURCE;
+                                       flags |= ZFS_ITER_RECVD_PROPS;
+                                       i = ZFS_GET_NCOLS;
+                                       break;
                                default:
                                        (void) fprintf(stderr,
                                            gettext("invalid column name "
@@ -1178,7 +1565,8 @@ zfs_do_get(int argc, char **argv)
                        while (*optarg != '\0') {
                                static char *source_subopts[] = {
                                        "local", "default", "inherited",
-                                       "temporary", "none", NULL };
+                                       "received", "temporary", "none",
+                                       NULL };
 
                                switch (getsubopt(&optarg, source_subopts,
                                    &value)) {
@@ -1192,9 +1580,12 @@ zfs_do_get(int argc, char **argv)
                                        cb.cb_sources |= ZPROP_SRC_INHERITED;
                                        break;
                                case 3:
-                                       cb.cb_sources |= ZPROP_SRC_TEMPORARY;
+                                       cb.cb_sources |= ZPROP_SRC_RECEIVED;
                                        break;
                                case 4:
+                                       cb.cb_sources |= ZPROP_SRC_TEMPORARY;
+                                       break;
+                               case 5:
                                        cb.cb_sources |= ZPROP_SRC_NONE;
                                        break;
                                default:
@@ -1206,13 +1597,44 @@ zfs_do_get(int argc, char **argv)
                        }
                        break;
 
-               case '?':
-                       (void) fprintf(stderr, gettext("invalid option '%c'\n"),
-                           optopt);
-                       usage(B_FALSE);
-               }
-       }
-
+               case 't':
+                       types = 0;
+                       flags &= ~ZFS_ITER_PROP_LISTSNAPS;
+                       while (*optarg != '\0') {
+                               static char *type_subopts[] = { "filesystem",
+                                   "volume", "snapshot", "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_DATASET;
+                                       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);
+                       usage(B_FALSE);
+               }
+       }
+
        argc -= optind;
        argv += optind;
 
@@ -1249,8 +1671,8 @@ 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,
-           &cb.cb_proplist, get_callback, &cb);
+       ret = zfs_for_each(argc, argv, flags, types, NULL,
+           &cb.cb_proplist, limit, get_callback, &cb);
 
        if (cb.cb_proplist == &fake_name)
                zprop_free_list(fake_name.pl_next);
@@ -1261,9 +1683,10 @@ zfs_do_get(int argc, char **argv)
 }
 
 /*
- * inherit [-r] <property> <fs|vol> ...
+ * inherit [-rS] <property> <fs|vol> ...
  *
- *     -r      Recurse over all children
+ *     -r      Recurse over all children
+ *     -S      Revert to received value, if any
  *
  * For each dataset specified on the command line, inherit the given property
  * from its parent.  Inheriting a property at the pool level will cause it to
@@ -1272,11 +1695,16 @@ zfs_do_get(int argc, char **argv)
  * local modifications for each dataset.
  */
 
+typedef struct inherit_cbdata {
+       const char *cb_propname;
+       boolean_t cb_received;
+} inherit_cbdata_t;
+
 static int
 inherit_recurse_cb(zfs_handle_t *zhp, void *data)
 {
-       char *propname = data;
-       zfs_prop_t prop = zfs_name_to_prop(propname);
+       inherit_cbdata_t *cb = data;
+       zfs_prop_t prop = zfs_name_to_prop(cb->cb_propname);
 
        /*
         * If we're doing it recursively, then ignore properties that
@@ -1286,15 +1714,15 @@ inherit_recurse_cb(zfs_handle_t *zhp, void *data)
            !zfs_prop_valid_for_type(prop, zfs_get_type(zhp)))
                return (0);
 
-       return (zfs_prop_inherit(zhp, propname) != 0);
+       return (zfs_prop_inherit(zhp, cb->cb_propname, cb->cb_received) != 0);
 }
 
 static int
 inherit_cb(zfs_handle_t *zhp, void *data)
 {
-       char *propname = data;
+       inherit_cbdata_t *cb = data;
 
-       return (zfs_prop_inherit(zhp, propname) != 0);
+       return (zfs_prop_inherit(zhp, cb->cb_propname, cb->cb_received) != 0);
 }
 
 static int
@@ -1302,16 +1730,21 @@ zfs_do_inherit(int argc, char **argv)
 {
        int c;
        zfs_prop_t prop;
+       inherit_cbdata_t cb = { 0 };
        char *propname;
-       int ret;
+       int ret = 0;
        int flags = 0;
+       boolean_t received = B_FALSE;
 
        /* check options */
-       while ((c = getopt(argc, argv, "r")) != -1) {
+       while ((c = getopt(argc, argv, "rS")) != -1) {
                switch (c) {
                case 'r':
                        flags |= ZFS_ITER_RECURSE;
                        break;
+               case 'S':
+                       received = B_TRUE;
+                       break;
                case '?':
                default:
                        (void) fprintf(stderr, gettext("invalid option '%c'\n"),
@@ -1344,7 +1777,7 @@ zfs_do_inherit(int argc, char **argv)
                            propname);
                        return (1);
                }
-               if (!zfs_prop_inheritable(prop)) {
+               if (!zfs_prop_inheritable(prop) && !received) {
                        (void) fprintf(stderr, gettext("'%s' property cannot "
                            "be inherited\n"), propname);
                        if (prop == ZFS_PROP_QUOTA ||
@@ -1355,18 +1788,27 @@ zfs_do_inherit(int argc, char **argv)
                                    "%s=none' to clear\n"), propname);
                        return (1);
                }
+               if (received && (prop == ZFS_PROP_VOLSIZE ||
+                   prop == ZFS_PROP_VERSION)) {
+                       (void) fprintf(stderr, gettext("'%s' property cannot "
+                           "be reverted to a received value\n"), propname);
+                       return (1);
+               }
        } else if (!zfs_prop_user(propname)) {
                (void) fprintf(stderr, gettext("invalid property '%s'\n"),
                    propname);
                usage(B_FALSE);
        }
 
+       cb.cb_propname = propname;
+       cb.cb_received = received;
+
        if (flags & ZFS_ITER_RECURSE) {
                ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET,
-                   NULL, NULL, inherit_recurse_cb, propname);
+                   NULL, NULL, 0, inherit_recurse_cb, &cb);
        } else {
                ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET,
-                   NULL, NULL, inherit_cb, propname);
+                   NULL, NULL, 0, inherit_cb, &cb);
        }
 
        return (ret);
@@ -1435,29 +1877,32 @@ upgrade_set_callback(zfs_handle_t *zhp, void *data)
 {
        upgrade_cbdata_t *cb = data;
        int version = zfs_prop_get_int(zhp, ZFS_PROP_VERSION);
+       int needed_spa_version;
+       int spa_version;
 
-       if (cb->cb_version >= ZPL_VERSION_FUID) {
-               int spa_version;
+       if (zfs_spa_version(zhp, &spa_version) < 0)
+               return (-1);
 
-               if (zfs_spa_version(zhp, &spa_version) < 0)
-                       return (-1);
+       needed_spa_version = zfs_spa_version_map(cb->cb_version);
 
-               if (spa_version < SPA_VERSION_FUID) {
-                       /* can't upgrade */
-                       (void) printf(gettext("%s: can not be upgraded; "
-                           "the pool version needs to first be upgraded\nto "
-                           "version %d\n\n"),
-                           zfs_get_name(zhp), SPA_VERSION_FUID);
-                       cb->cb_numfailed++;
-                       return (0);
-               }
+       if (needed_spa_version < 0)
+               return (-1);
+
+       if (spa_version < needed_spa_version) {
+               /* can't upgrade */
+               (void) printf(gettext("%s: can not be "
+                   "upgraded; the pool version needs to first "
+                   "be upgraded\nto version %d\n\n"),
+                   zfs_get_name(zhp), needed_spa_version);
+               cb->cb_numfailed++;
+               return (0);
        }
 
        /* upgrade */
        if (version < cb->cb_version) {
                char verstr[16];
                (void) snprintf(verstr, sizeof (verstr),
-                   "%llu", cb->cb_version);
+                   "%llu", (u_longlong_t)cb->cb_version);
                if (cb->cb_lastfs[0] && !same_pool(zhp, cb->cb_lastfs)) {
                        /*
                         * If they did "zfs upgrade -a", then we could
@@ -1493,9 +1938,9 @@ 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 };
-       char c;
+       signed char c;
        int flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
 
        /* check options */
@@ -1548,26 +1993,27 @@ 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 identifer (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"));
                (void) printf(gettext("\nFor more information on a particular "
-                   "version, including supported releases, see:\n\n"));
-               (void) printf("http://www.opensolaris.org/os/community/zfs/"
-                   "version/zpl/N\n\n");
-               (void) printf(gettext("Where 'N' is the version number.\n"));
+                   "version, including supported releases,\n"));
+               (void) printf("see the ZFS Administration Guide.\n\n");
                ret = 0;
        } else if (argc || all) {
                /* Upgrade filesystems */
                if (cb.cb_version == 0)
                        cb.cb_version = ZPL_VERSION;
                ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_FILESYSTEM,
-                   NULL, NULL, upgrade_set_callback, &cb);
+                   NULL, NULL, 0, upgrade_set_callback, &cb);
                (void) printf(gettext("%llu filesystems upgraded\n"),
-                   cb.cb_numupgraded);
+                   (u_longlong_t)cb.cb_numupgraded);
                if (cb.cb_numsamegraded) {
                        (void) printf(gettext("%llu filesystems already at "
                            "this version\n"),
-                           cb.cb_numsamegraded);
+                           (u_longlong_t)cb.cb_numsamegraded);
                }
                if (cb.cb_numfailed != 0)
                        ret = 1;
@@ -1579,14 +2025,14 @@ zfs_do_upgrade(int argc, char **argv)
 
                flags |= ZFS_ITER_RECURSE;
                ret = zfs_for_each(0, NULL, flags, ZFS_TYPE_FILESYSTEM,
-                   NULL, NULL, upgrade_list_callback, &cb);
+                   NULL, NULL, 0, upgrade_list_callback, &cb);
 
                found = cb.cb_foundone;
                cb.cb_foundone = B_FALSE;
                cb.cb_newer = B_TRUE;
 
                ret = zfs_for_each(0, NULL, flags, ZFS_TYPE_FILESYSTEM,
-                   NULL, NULL, upgrade_list_callback, &cb);
+                   NULL, NULL, 0, upgrade_list_callback, &cb);
 
                if (!cb.cb_foundone && !found) {
                        (void) printf(gettext("All filesystems are "
@@ -1598,301 +2044,557 @@ zfs_do_upgrade(int argc, char **argv)
 }
 
 /*
- * list [-rH] [-o property[,property]...] [-t type[,type]...]
- *      [-s property [-s property]...] [-S property [-S property]...]
- *      <dataset> ...
+ * 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
  *
- *     -r      Recurse over all children
- *     -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.
+ *     -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 (parseable) numeric output.
+ *     -s      Specify sort columns, descending order.
+ *     -S      Specify sort columns, ascending order.
+ *     -t      Control which object types to display.
  *
- * When given no arguments, lists all filesystems in the system.
- * Otherwise, list the specified datasets, optionally recursing down them if
- * '-r' is specified.
+ *     Displays space consumed by, and quotas on, each user in the specified
+ *     filesystem or snapshot.
  */
-typedef struct list_cbdata {
-       boolean_t       cb_first;
-       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(zprop_list_t *pl)
+/* 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
+};
+static char *us_field_hdr[] = { "TYPE", "NAME", "USED", "QUOTA" };
+static char *us_field_names[] = { "type", "name", "used", "quota" };
+#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", "posxiuser", "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
+us_field_index(char *field)
 {
-       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;
-               }
+       for (i = 0; i < USFIELD_LAST; i++) {
+               if (strcmp(field, us_field_names[i]) == 0)
+                       return (i);
+       }
 
-               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;
+       return (-1);
+}
+
+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) {
+                               (void) nvlist_lookup_uint64(lnvl, propname,
+                                   &lv64);
+                               (void) nvlist_lookup_uint64(rnvl, propname,
+                                   &rv64);
+                               if (rv64 != lv64)
+                                       rc = (rv64 < lv64) ? 1 : -1;
+                       } else {
+                               (void) nvlist_lookup_string(lnvl, propname,
+                                   &lvstr);
+                               (void) nvlist_lookup_string(rnvl, propname,
+                                   &rvstr);
+                               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;
+               default:
+                       break;
                }
 
-               if (pl->pl_next == NULL && !right_justify)
-                       (void) printf("%s", header);
-               else if (right_justify)
-                       (void) printf("%*s", pl->pl_width, header);
-               else
-                       (void) printf("%-*s", pl->pl_width, header);
+               if (rc != 0) {
+                       if (rc < 0)
+                               return (reverse ? 1 : -1);
+                       else
+                               return (reverse ? -1 : 1);
+               }
        }
 
-       (void) printf("\n");
+       /*
+        * 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);
 }
 
-/*
- * 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)
+static inline const char *
+us_type2str(unsigned field_type)
 {
-       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;
+       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");
+       }
+}
 
-       for (; pl != NULL; pl = pl->pl_next) {
-               if (!first) {
-                       if (scripted)
-                               (void) printf("\t");
-                       else
-                               (void) printf("  ");
+static int
+userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space)
+{
+       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[ZFS_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 {
-                       first = B_FALSE;
+                       type = USTYPE_SMB_USR;
+                       err = sid_to_id(sid, B_TRUE, &id);
                }
 
-               right_justify = B_FALSE;
-               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;
-
-                       right_justify = zfs_prop_align_right(pl->pl_prop);
-               } else {
-                       if (nvlist_lookup_nvlist(userprops,
-                           pl->pl_user_prop, &propval) != 0)
-                               propstr = "-";
-                       else
-                               verify(nvlist_lookup_string(propval,
-                                   ZPROP_VALUE, &propstr) == 0);
+               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);
 
-               width = pl->pl_width;
+               return (-1);
+#endif /* HAVE_IDMAP */
+       }
 
-               /*
-                * 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))
-                       (void) printf("%s", propstr);
-               else if (right_justify)
-                       (void) printf("%*s", width, propstr);
-               else
-                       (void) printf("%-*s", width, propstr);
+       if (cb->cb_sid2posix || domain == NULL || domain[0] == '\0') {
+               /* POSIX or -i */
+               if (prop == ZFS_PROP_GROUPUSED || prop == ZFS_PROP_GROUPQUOTA) {
+                       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;
+                       }
+               }
        }
 
-       (void) printf("\n");
-}
+       /*
+        * Make sure that the type/name combination is unique when doing
+        * SID to POSIX ID translation (hence changing the type from SMB to
+        * POSIX).
+        */
+       if (cb->cb_sid2posix &&
+           nvlist_add_boolean_value(props, "smbentity", smbentity) != 0)
+               nomem();
+
+       /* 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();
+
+       /* 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 (namelen > cb->cb_width[nameidx])
+               cb->cb_width[nameidx] = namelen;
 
-/*
- * Generic callback function to list a dataset or snapshot.
- */
-static int
-list_callback(zfs_handle_t *zhp, void *data)
-{
-       list_cbdata_t *cbp = data;
+       /*
+        * 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;
+       }
 
-       if (cbp->cb_first) {
-               if (!cbp->cb_scripted)
-                       print_header(cbp->cb_proplist);
-               cbp->cb_first = B_FALSE;
+       /* 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 {
+               propname = "quota";
+               if (!nvlist_exists(props, "used"))
+                       (void) nvlist_add_uint64(props, "used", 0);
        }
+       sizeidx = us_field_index(propname);
+       if (sizelen > cb->cb_width[sizeidx])
+               cb->cb_width[sizeidx] = sizelen;
 
-       print_dataset(zhp, cbp->cb_proplist, cbp->cb_scripted);
+       if (nvlist_add_uint64(props, propname, space) != 0)
+               nomem();
 
        return (0);
 }
 
-static int
-zfs_do_list(int argc, char **argv)
+static void
+print_us_node(boolean_t scripted, boolean_t parsable, int *fields, int types,
+    size_t *width, us_node_t *node)
 {
-       int c;
-       boolean_t scripted = B_FALSE;
-       static char default_fields[] =
-           "name,used,available,referenced,mountpoint";
-       int types = ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME;
-       boolean_t types_specified = B_FALSE;
-       char *fields = NULL;
-       list_cbdata_t cb = { 0 };
-       char *value;
-       int ret;
-       zfs_sort_column_t *sortcol = NULL;
-       int flags = ZFS_ITER_PROP_LISTSNAPS | ZFS_ITER_ARGS_CAN_BE_PATHS;
+       nvlist_t *nvl = node->usn_nvl;
+       char valstr[ZFS_MAXNAMELEN];
+       boolean_t first = B_TRUE;
+       int cfield = 0;
+       int field;
+       uint32_t ustype;
 
-       /* check options */
-       while ((c = getopt(argc, argv, ":o:rt:Hs:S:")) != -1) {
-               switch (c) {
-               case 'o':
-                       fields = optarg;
+       /* 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 = NULL;
+
+               while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) {
+                       if (strcmp(nvpair_name(nvp),
+                           us_field_names[field]) == 0)
+                               break;
+               }
+
+               type = nvpair_type(nvp);
+               switch (type) {
+               case DATA_TYPE_UINT32:
+                       (void) nvpair_value_uint32(nvp, &val32);
                        break;
-               case 'r':
-                       flags |= ZFS_ITER_RECURSE;
+               case DATA_TYPE_UINT64:
+                       (void) nvpair_value_uint64(nvp, &val64);
                        break;
-               case 'H':
-                       scripted = B_TRUE;
+               case DATA_TYPE_STRING:
+                       (void) nvpair_value_string(nvp, &strval);
                        break;
-               case 's':
-                       if (zfs_add_sort_column(&sortcol, optarg,
-                           B_FALSE) != 0) {
-                               (void) fprintf(stderr,
-                                   gettext("invalid property '%s'\n"), optarg);
-                               usage(B_FALSE);
+               default:
+                       (void) fprintf(stderr, "invalid data type\n");
+               }
+
+               switch (field) {
+               case USFIELD_TYPE:
+                       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 'S':
-                       if (zfs_add_sort_column(&sortcol, optarg,
-                           B_TRUE) != 0) {
-                               (void) fprintf(stderr,
-                                   gettext("invalid property '%s'\n"), optarg);
-                               usage(B_FALSE);
+               case USFIELD_USED:
+               case USFIELD_QUOTA:
+                       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 &&
+                                   strcmp(valstr, "0") == 0)
+                                       strval = "none";
+                               else
+                                       strval = valstr;
                        }
                        break;
-               case 't':
-                       types = 0;
-                       types_specified = B_TRUE;
-                       flags &= ~ZFS_ITER_PROP_LISTSNAPS;
-                       while (*optarg != '\0') {
-                               static char *type_subopts[] = { "filesystem",
-                                   "volume", "snapshot", "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_DATASET;
-                                       break;
-
-                               default:
-                                       (void) fprintf(stderr,
-                                           gettext("invalid type '%s'\n"),
-                                           value);
-                                       usage(B_FALSE);
-                               }
-                       }
-                       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 (fields == NULL)
-               fields = default_fields;
-
-       /*
-        * If "-o space" and no types were specified, don't display snapshots.
-        */
-       if (strcmp(fields, "space") == 0 && types_specified == B_FALSE)
-               types &= ~ZFS_TYPE_SNAPSHOT;
-
-       /*
-        * If the user specifies '-o all', the zprop_get_list() doesn't
-        * normally include the name of the dataset.  For 'zfs list', we always
-        * want this property to be first.
-        */
-       if (zprop_get_list(g_zfs, fields, &cb.cb_proplist, ZFS_TYPE_DATASET)
-           != 0)
-               usage(B_FALSE);
 
-       cb.cb_scripted = scripted;
-       cb.cb_first = B_TRUE;
+               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) width[field], strval);
 
-       ret = zfs_for_each(argc, argv, flags, types, sortcol, &cb.cb_proplist,
-           list_callback, &cb);
+               first = B_FALSE;
+               cfield++;
+       }
 
-       zprop_free_list(cb.cb_proplist);
-       zfs_free_sort_columns(sortcol);
+       (void) printf("\n");
+}
 
-       if (ret == 0 && cb.cb_first && !cb.cb_scripted)
-               (void) printf(gettext("no datasets available\n"));
+static void
+print_us(boolean_t scripted, boolean_t parsable, int *fields, int types,
+    size_t *width, boolean_t rmnode, uu_avl_t *avl)
+{
+       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");
+       }
 
-       return (ret);
+       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);
+       }
 }
 
-/*
- * zfs rename <fs | snap | vol> <fs | snap | vol>
- * zfs rename -p <fs | vol> <fs | vol>
- * zfs rename -r <snap> <snap>
- *
- * Renames the given dataset to another of the same type.
- *
- * The '-p' flag creates all the non-existing ancestors of the target first.
- */
-/* ARGSUSED */
 static int
-zfs_do_rename(int argc, char **argv)
+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";
+       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;
-       int ret;
-       boolean_t recurse = B_FALSE;
-       boolean_t parents = B_FALSE;
+       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);
 
-       /* check options */
-       while ((c = getopt(argc, argv, "pr")) != -1) {
+       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':
-                       parents = B_TRUE;
+                       parsable = B_TRUE;
                        break;
-               case 'r':
-                       recurse = B_TRUE;
+               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 '?':
-               default:
                        (void) fprintf(stderr, gettext("invalid option '%c'\n"),
                            optopt);
                        usage(B_FALSE);
@@ -1902,202 +2604,391 @@ zfs_do_rename(int argc, char **argv)
        argc -= optind;
        argv += optind;
 
-       /* check number of arguments */
        if (argc < 1) {
-               (void) fprintf(stderr, gettext("missing source dataset "
-                   "argument\n"));
-               usage(B_FALSE);
-       }
-       if (argc < 2) {
-               (void) fprintf(stderr, gettext("missing target dataset "
-                   "argument\n"));
+               (void) fprintf(stderr, gettext("missing dataset name\n"));
                usage(B_FALSE);
        }
-       if (argc > 2) {
+       if (argc > 1) {
                (void) fprintf(stderr, gettext("too many arguments\n"));
                usage(B_FALSE);
        }
 
-       if (recurse && parents) {
-               (void) fprintf(stderr, gettext("-p and -r options are mutually "
-                   "exclusive\n"));
-               usage(B_FALSE);
-       }
-
-       if (recurse && strchr(argv[0], '@') == 0) {
-               (void) fprintf(stderr, gettext("source dataset for recursive "
-                   "rename must be a snapshot\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], parents ? ZFS_TYPE_FILESYSTEM |
-           ZFS_TYPE_VOLUME : ZFS_TYPE_DATASET)) == NULL)
+       if ((zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_DATASET)) == NULL)
                return (1);
 
-       /* If we were asked and the name looks good, try to create ancestors. */
-       if (parents && zfs_name_valid(argv[1], zfs_get_type(zhp)) &&
-           zfs_create_ancestors(g_zfs, argv[1]) != 0) {
-               zfs_close(zhp);
-               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 (((p == ZFS_PROP_USERUSED || p == ZFS_PROP_USERQUOTA) &&
+                   !(types & (USTYPE_PSX_USR | USTYPE_SMB_USR))) ||
+                   ((p == ZFS_PROP_GROUPUSED || p == ZFS_PROP_GROUPQUOTA) &&
+                   !(types & (USTYPE_PSX_GRP | USTYPE_SMB_GRP))))
+                       continue;
+               cb.cb_prop = p;
+               if ((ret = zfs_userspace(zhp, p, userspace_cb, &cb)) != 0)
+                       return (ret);
        }
 
-       ret = (zfs_rename(zhp, argv[1], recurse) != 0);
+       /* Sort the list */
+       if ((node = uu_avl_first(avl_tree)) == NULL)
+               return (0);
 
-       zfs_close(zhp);
-       return (ret);
-}
+       us_populated = B_TRUE;
 
-/*
- * zfs promote <fs>
- *
- * Promotes the given clone fs to be the parent
- */
-/* ARGSUSED */
-static int
-zfs_do_promote(int argc, char **argv)
-{
-       zfs_handle_t *zhp;
-       int ret;
+       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);
 
-       /* check options */
-       if (argc > 1 && argv[1][0] == '-') {
-               (void) fprintf(stderr, gettext("invalid option '%c'\n"),
-                   argv[1][1]);
-               usage(B_FALSE);
+       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);
        }
 
-       /* check number of arguments */
-       if (argc < 2) {
-               (void) fprintf(stderr, gettext("missing clone filesystem"
-                   " argument\n"));
-               usage(B_FALSE);
-       }
-       if (argc > 2) {
-               (void) fprintf(stderr, gettext("too many arguments\n"));
-               usage(B_FALSE);
+       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);
        }
 
-       zhp = zfs_open(g_zfs, argv[1], ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
-       if (zhp == NULL)
-               return (1);
+       uu_list_destroy(list);
+       uu_list_pool_destroy(listpool);
 
-       ret = (zfs_promote(zhp) != 0);
+       /* 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);
 
-       zfs_close(zhp);
        return (ret);
 }
 
 /*
- * zfs rollback [-rRf] <snapshot>
+ * list [-r][-d max] [-H] [-o property[,property]...] [-t type[,type]...]
+ *      [-s property [-s property]...] [-S property [-S property]...]
+ *      <dataset> ...
  *
- *     -r      Delete any intervening snapshots before doing rollback
- *     -R      Delete any snapshots and their clones
- *     -f      ignored for backwards compatability
+ *     -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.
  *
- * Given a filesystem, rollback to a specific snapshot, discarding any changes
- * since then and making it the active dataset.  If more recent snapshots exist,
- * the command will complain unless the '-r' flag is given.
+ * 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 rollback_cbdata {
-       uint64_t        cb_create;
+typedef struct list_cbdata {
        boolean_t       cb_first;
-       int             cb_doclones;
-       char            *cb_target;
-       int             cb_error;
-       boolean_t       cb_recurse;
-       boolean_t       cb_dependent;
-} rollback_cbdata_t;
+       boolean_t       cb_scripted;
+       zprop_list_t    *cb_proplist;
+} list_cbdata_t;
 
 /*
- * 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
- * 'cb_dependent' is set, then this is a dependent and we should report it
- * without checking the transaction group.
+ * Given a list of columns to display, output appropriate headers for each one.
  */
-static int
-rollback_check(zfs_handle_t *zhp, void *data)
+static void
+print_header(zprop_list_t *pl)
 {
-       rollback_cbdata_t *cbp = data;
+       char headerbuf[ZFS_MAXPROPLEN];
+       const char *header;
+       int i;
+       boolean_t first = B_TRUE;
+       boolean_t right_justify;
 
-       if (cbp->cb_doclones) {
-               zfs_close(zhp);
-               return (0);
-       }
+       for (; pl != NULL; pl = pl->pl_next) {
+               if (!first) {
+                       (void) printf("  ");
+               } else {
+                       first = B_FALSE;
+               }
 
-       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) {
+               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 (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 (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);
+       }
 
-                       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));
-                       }
+       (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)
+{
+       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 {
+                       first = B_FALSE;
                }
-       } else {
-               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;
+
+               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, B_FALSE) != 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), B_FALSE) != 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), B_FALSE) != 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,
+                                   ZPROP_VALUE, &propstr) == 0);
+                       right_justify = B_FALSE;
                }
 
-               (void) fprintf(stderr, "%s\n", zfs_get_name(zhp));
+               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))
+                       (void) printf("%s", propstr);
+               else if (right_justify)
+                       (void) printf("%*s", width, propstr);
+               else
+                       (void) printf("%-*s", width, propstr);
        }
 
-       zfs_close(zhp);
+       (void) printf("\n");
+}
+
+/*
+ * Generic callback function to list a dataset or snapshot.
+ */
+static int
+list_callback(zfs_handle_t *zhp, void *data)
+{
+       list_cbdata_t *cbp = data;
+
+       if (cbp->cb_first) {
+               if (!cbp->cb_scripted)
+                       print_header(cbp->cb_proplist);
+               cbp->cb_first = B_FALSE;
+       }
+
+       print_dataset(zhp, cbp->cb_proplist, cbp->cb_scripted);
+
        return (0);
 }
 
 static int
-zfs_do_rollback(int argc, char **argv)
+zfs_do_list(int argc, char **argv)
 {
-       int ret;
        int c;
-       boolean_t force = B_FALSE;
-       rollback_cbdata_t cb = { 0 };
-       zfs_handle_t *zhp, *snap;
-       char parentname[ZFS_MAXNAMELEN];
-       char *delim;
+       boolean_t scripted = B_FALSE;
+       static char default_fields[] =
+           "name,used,available,referenced,mountpoint";
+       int types = ZFS_TYPE_DATASET;
+       boolean_t types_specified = B_FALSE;
+       char *fields = NULL;
+       list_cbdata_t cb = { 0 };
+       char *value;
+       int limit = 0;
+       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, "rRf")) != -1) {
+       while ((c = getopt(argc, argv, ":d:o:rt:Hs:S:")) != -1) {
                switch (c) {
+               case 'o':
+                       fields = optarg;
+                       break;
+               case 'd':
+                       limit = parse_depth(optarg, &flags);
+                       break;
                case 'r':
-                       cb.cb_recurse = 1;
+                       flags |= ZFS_ITER_RECURSE;
                        break;
-               case 'R':
-                       cb.cb_recurse = 1;
-                       cb.cb_doclones = 1;
+               case 'H':
+                       scripted = B_TRUE;
                        break;
-               case 'f':
-                       force = B_TRUE;
+               case 's':
+                       if (zfs_add_sort_column(&sortcol, optarg,
+                           B_FALSE) != 0) {
+                               (void) fprintf(stderr,
+                                   gettext("invalid property '%s'\n"), optarg);
+                               usage(B_FALSE);
+                       }
+                       break;
+               case 'S':
+                       if (zfs_add_sort_column(&sortcol, optarg,
+                           B_TRUE) != 0) {
+                               (void) fprintf(stderr,
+                                   gettext("invalid property '%s'\n"), optarg);
+                               usage(B_FALSE);
+                       }
+                       break;
+               case 't':
+                       types = 0;
+                       types_specified = B_TRUE;
+                       flags &= ~ZFS_ITER_PROP_LISTSNAPS;
+                       while (*optarg != '\0') {
+                               static char *type_subopts[] = { "filesystem",
+                                   "volume", "snapshot", "snap", "all", NULL };
+
+                               switch (getsubopt(&optarg, type_subopts,
+                                   &value)) {
+                               case 0:
+                                       types |= ZFS_TYPE_FILESYSTEM;
+                                       break;
+                               case 1:
+                                       types |= ZFS_TYPE_VOLUME;
+                                       break;
+                               case 2:
+                               case 3:
+                                       types |= ZFS_TYPE_SNAPSHOT;
+                                       break;
+                               case 4:
+                                       types = ZFS_TYPE_DATASET;
+                                       break;
+
+                               default:
+                                       (void) fprintf(stderr,
+                                           gettext("invalid type '%s'\n"),
+                                           value);
+                                       usage(B_FALSE);
+                               }
+                       }
+                       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"),
@@ -2109,356 +3000,1974 @@ zfs_do_rollback(int argc, char **argv)
        argc -= optind;
        argv += optind;
 
-       /* check number of arguments */
-       if (argc < 1) {
-               (void) fprintf(stderr, gettext("missing dataset argument\n"));
-               usage(B_FALSE);
-       }
-       if (argc > 1) {
-               (void) fprintf(stderr, gettext("too many arguments\n"));
-               usage(B_FALSE);
+       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.
+        */
+       if (strcmp(fields, "space") == 0 && types_specified == B_FALSE)
+               types &= ~ZFS_TYPE_SNAPSHOT;
+
+       /*
+        * If the user specifies '-o all', the zprop_get_list() doesn't
+        * normally include the name of the dataset.  For 'zfs list', we always
+        * want this property to be first.
+        */
+       if (zprop_get_list(g_zfs, fields, &cb.cb_proplist, ZFS_TYPE_DATASET)
+           != 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,
+           limit, list_callback, &cb);
+
+       zprop_free_list(cb.cb_proplist);
+       zfs_free_sort_columns(sortcol);
+
+       if (ret == 0 && cb.cb_first && !cb.cb_scripted)
+               (void) fprintf(stderr, gettext("no datasets available\n"));
+
+       return (ret);
+}
+
+/*
+ * 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.
+ *
+ * The '-p' flag creates all the non-existing ancestors of the target first.
+ */
+/* ARGSUSED */
+static int
+zfs_do_rename(int argc, char **argv)
+{
+       zfs_handle_t *zhp;
+       int c;
+       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, "prf")) != -1) {
+               switch (c) {
+               case 'p':
+                       parents = B_TRUE;
+                       break;
+               case 'r':
+                       recurse = B_TRUE;
+                       break;
+               case 'f':
+                       force_unmount = B_TRUE;
+                       break;
+               case '?':
+               default:
+                       (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 source dataset "
+                   "argument\n"));
+               usage(B_FALSE);
+       }
+       if (argc < 2) {
+               (void) fprintf(stderr, gettext("missing target dataset "
+                   "argument\n"));
+               usage(B_FALSE);
+       }
+       if (argc > 2) {
+               (void) fprintf(stderr, gettext("too many arguments\n"));
+               usage(B_FALSE);
+       }
+
+       if (recurse && parents) {
+               (void) fprintf(stderr, gettext("-p and -r options are mutually "
+                   "exclusive\n"));
+               usage(B_FALSE);
+       }
+
+       if (recurse && strchr(argv[0], '@') == 0) {
+               (void) fprintf(stderr, gettext("source dataset for recursive "
+                   "rename must be a snapshot\n"));
+               usage(B_FALSE);
+       }
+
+       if ((zhp = zfs_open(g_zfs, argv[0], parents ? ZFS_TYPE_FILESYSTEM |
+           ZFS_TYPE_VOLUME : ZFS_TYPE_DATASET)) == NULL)
+               return (1);
+
+       /* If we were asked and the name looks good, try to create ancestors. */
+       if (parents && zfs_name_valid(argv[1], zfs_get_type(zhp)) &&
+           zfs_create_ancestors(g_zfs, argv[1]) != 0) {
+               zfs_close(zhp);
+               return (1);
+       }
+
+       ret = (zfs_rename(zhp, argv[1], recurse, force_unmount) != 0);
+
+       zfs_close(zhp);
+       return (ret);
+}
+
+/*
+ * zfs promote <fs>
+ *
+ * Promotes the given clone fs to be the parent
+ */
+/* ARGSUSED */
+static int
+zfs_do_promote(int argc, char **argv)
+{
+       zfs_handle_t *zhp;
+       int ret = 0;
+
+       /* check options */
+       if (argc > 1 && argv[1][0] == '-') {
+               (void) fprintf(stderr, gettext("invalid option '%c'\n"),
+                   argv[1][1]);
+               usage(B_FALSE);
+       }
+
+       /* check number of arguments */
+       if (argc < 2) {
+               (void) fprintf(stderr, gettext("missing clone filesystem"
+                   " argument\n"));
+               usage(B_FALSE);
+       }
+       if (argc > 2) {
+               (void) fprintf(stderr, gettext("too many arguments\n"));
+               usage(B_FALSE);
+       }
+
+       zhp = zfs_open(g_zfs, argv[1], ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
+       if (zhp == NULL)
+               return (1);
+
+       ret = (zfs_promote(zhp) != 0);
+
+
+       zfs_close(zhp);
+       return (ret);
+}
+
+/*
+ * zfs rollback [-rRf] <snapshot>
+ *
+ *     -r      Delete any intervening snapshots before doing rollback
+ *     -R      Delete any snapshots and their clones
+ *     -f      ignored for backwards compatability
+ *
+ * Given a filesystem, rollback to a specific snapshot, discarding any changes
+ * since then and making it the active dataset.  If more recent snapshots exist,
+ * the command will complain unless the '-r' flag is given.
+ */
+typedef struct rollback_cbdata {
+       uint64_t        cb_create;
+       boolean_t       cb_first;
+       int             cb_doclones;
+       char            *cb_target;
+       int             cb_error;
+       boolean_t       cb_recurse;
+       boolean_t       cb_dependent;
+} rollback_cbdata_t;
+
+/*
+ * 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
+ * 'cb_dependent' is set, then this is a dependent and we should report it
+ * without checking the transaction group.
+ */
+static int
+rollback_check(zfs_handle_t *zhp, void *data)
+{
+       rollback_cbdata_t *cbp = data;
+
+       if (cbp->cb_doclones) {
+               zfs_close(zhp);
+               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"),
+                           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);
+}
+
+static int
+zfs_do_rollback(int argc, char **argv)
+{
+       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 *delim;
+
+       /* check options */
+       while ((c = getopt(argc, argv, "rRf")) != -1) {
+               switch (c) {
+               case 'r':
+                       cb.cb_recurse = 1;
+                       break;
+               case 'R':
+                       cb.cb_recurse = 1;
+                       cb.cb_doclones = 1;
+                       break;
+               case 'f':
+                       force = B_TRUE;
+                       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 dataset argument\n"));
+               usage(B_FALSE);
+       }
+       if (argc > 1) {
+               (void) fprintf(stderr, gettext("too many arguments\n"));
+               usage(B_FALSE);
+       }
+
+       /* open the snapshot */
+       if ((snap = zfs_open(g_zfs, argv[0], ZFS_TYPE_SNAPSHOT)) == NULL)
+               return (1);
+
+       /* open the parent dataset */
+       (void) strlcpy(parentname, argv[0], sizeof (parentname));
+       verify((delim = strrchr(parentname, '@')) != NULL);
+       *delim = '\0';
+       if ((zhp = zfs_open(g_zfs, parentname, ZFS_TYPE_DATASET)) == NULL) {
+               zfs_close(snap);
+               return (1);
+       }
+
+       /*
+        * Check for more recent snapshots and/or clones based on the presence
+        * of '-r' and '-R'.
+        */
+       cb.cb_target = argv[0];
+       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)
+               goto out;
+
+       if ((ret = cb.cb_error) != 0)
+               goto out;
+
+       /*
+        * Rollback parent to the given snapshot.
+        */
+       ret = zfs_rollback(zhp, snap, force);
+
+out:
+       zfs_close(snap);
+       zfs_close(zhp);
+
+       if (ret == 0)
+               return (0);
+       else
+               return (1);
+}
+
+/*
+ * zfs set property=value { fs | snap | vol } ...
+ *
+ * Sets the given property 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;
+
+       if (zfs_prop_set(zhp, cbp->cb_propname, cbp->cb_value) != 0) {
+               switch (libzfs_errno(g_zfs)) {
+               case EZFS_MOUNTFAILED:
+                       (void) fprintf(stderr, gettext("property may be set "
+                           "but unable to remount filesystem\n"));
+                       break;
+               case EZFS_SHARENFSFAILED:
+                       (void) fprintf(stderr, gettext("property may be set "
+                           "but unable to reshare filesystem\n"));
+                       break;
+               }
+               return (1);
+       }
+       return (0);
+}
+
+static int
+zfs_do_set(int argc, char **argv)
+{
+       set_cbdata_t cb;
+       int ret = 0;
+
+       /* check for options */
+       if (argc > 1 && argv[1][0] == '-') {
+               (void) fprintf(stderr, gettext("invalid option '%c'\n"),
+                   argv[1][1]);
+               usage(B_FALSE);
+       }
+
+       /* check number of arguments */
+       if (argc < 2) {
+               (void) fprintf(stderr, gettext("missing property=value "
+                   "argument\n"));
+               usage(B_FALSE);
+       }
+       if (argc < 3) {
+               (void) fprintf(stderr, gettext("missing dataset name\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"));
+               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);
+       }
+
+       ret = zfs_for_each(argc - 2, argv + 2, 0,
+           ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb);
+
+       return (ret);
+}
+
+/*
+ * zfs snapshot [-r] [-o prop=value] ... <fs@snap>
+ *
+ * Creates a snapshot with the given name.  While functionally equivalent to
+ * 'zfs create', it is a separate command to differentiate intent.
+ */
+static int
+zfs_do_snapshot(int argc, char **argv)
+{
+       boolean_t recursive = B_FALSE;
+       int ret = 0;
+       signed char c;
+       nvlist_t *props;
+
+       if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
+               nomem();
+
+       /* check options */
+       while ((c = getopt(argc, argv, "ro:")) != -1) {
+               switch (c) {
+               case 'o':
+                       if (parseprop(props))
+                               return (1);
+                       break;
+               case 'r':
+                       recursive = B_TRUE;
+                       break;
+               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 > 1) {
+               (void) fprintf(stderr, gettext("too many arguments\n"));
+               goto usage;
+       }
+
+       ret = zfs_snapshot(g_zfs, argv[0], recursive, props);
+       nvlist_free(props);
+       if (ret && recursive)
+               (void) fprintf(stderr, gettext("no snapshots were created\n"));
+       return (ret != 0);
+
+usage:
+       nvlist_free(props);
+       usage(B_FALSE);
+       return (-1);
+}
+
+/*
+ * Send a backup stream to stdout.
+ */
+static int
+zfs_do_send(int argc, char **argv)
+{
+       char *fromname = NULL;
+       char *toname = NULL;
+       char *cp;
+       zfs_handle_t *zhp;
+       sendflags_t flags = { 0 };
+       int c, err;
+       nvlist_t *dbgnv = NULL;
+       boolean_t extraverbose = B_FALSE;
+
+       /* check options */
+       while ((c = getopt(argc, argv, ":i:I:RDpvnP")) != -1) {
+               switch (c) {
+               case 'i':
+                       if (fromname)
+                               usage(B_FALSE);
+                       fromname = optarg;
+                       break;
+               case 'I':
+                       if (fromname)
+                               usage(B_FALSE);
+                       fromname = optarg;
+                       flags.doall = B_TRUE;
+                       break;
+               case 'R':
+                       flags.replicate = B_TRUE;
+                       break;
+               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 ':':
+                       (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);
+       }
+
+       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);
+       }
+       *cp = '\0';
+       toname = cp + 1;
+       zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
+       if (zhp == NULL)
+               return (1);
+
+       /*
+        * If they specified the full path to the snapshot, chop off
+        * everything except the short name of the snapshot, but special
+        * case if they specify the origin.
+        */
+       if (fromname && (cp = strchr(fromname, '@')) != NULL) {
+               char origin[ZFS_MAXNAMELEN];
+               zprop_source_t src;
+
+               (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);
+}
+
+/*
+ * zfs receive [-vnFu] [-d | -e] <fs@snap>
+ *
+ * Restore a backup stream from stdin.
+ */
+static int
+zfs_do_receive(int argc, char **argv)
+{
+       int c, err;
+       recvflags_t flags = { 0 };
+
+       /* check options */
+       while ((c = getopt(argc, argv, ":denuvF")) != -1) {
+               switch (c) {
+               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 'F':
+                       flags.force = 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);
+       }
+
+       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);
+       }
+
+       err = zfs_receive(g_zfs, argv[0], &flags, STDIN_FILENO, NULL);
+
+       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_HOLD             "hold"
+#define        ZFS_DELEG_PERM_RELEASE          "release"
+#define        ZFS_DELEG_PERM_DIFF             "diff"
+
+#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_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 },
+       { 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:
+               /* other */
+               return (gettext("other"));
+       default:
+               return (gettext("subcommand"));
+       }
+}
+
+static int inline
+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 inline
+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;
        }
 
-       /* open the snapshot */
-       if ((snap = zfs_open(g_zfs, argv[0], ZFS_TYPE_SNAPSHOT)) == NULL)
-               return (1);
 
-       /* open the parent dataset */
-       (void) strlcpy(parentname, argv[0], sizeof (parentname));
-       verify((delim = strrchr(parentname, '@')) != NULL);
-       *delim = '\0';
-       if ((zhp = zfs_open(g_zfs, parentname, ZFS_TYPE_DATASET)) == NULL) {
-               zfs_close(snap);
-               return (1);
+       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 */
        }
+}
 
-       /*
-        * Check for more recent snapshots and/or clones based on the presence
-        * of '-r' and '-R'.
-        */
-       cb.cb_target = argv[0];
-       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)
-               goto out;
+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;
 
-       if ((ret = cb.cb_error) != 0)
-               goto out;
+       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));
 
-       /*
-        * Rollback parent to the given snapshot.
-        */
-       ret = zfs_rollback(zhp, snap, force);
+               VERIFY(type == DATA_TYPE_BOOLEAN);
 
-out:
-       zfs_close(snap);
-       zfs_close(zhp);
+               uu_avl_node_init(node, &node->dpn_avl_node, avl_pool);
+               set_deleg_perm_node(avl, node, who_type, name, locality);
+       }
 
-       if (ret == 0)
-               return (0);
-       else
-               return (1);
+       return (0);
 }
 
-/*
- * zfs set property=value { fs | snap | vol } ...
- *
- * Sets the given property 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)
+static inline int
+parse_fs_perm(fs_perm_t *fsperm, nvlist_t *nvl)
 {
-       set_cbdata_t *cbp = data;
+       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);
 
-       if (zfs_prop_set(zhp, cbp->cb_propname, cbp->cb_value) != 0) {
-               switch (libzfs_errno(g_zfs)) {
-               case EZFS_MOUNTFAILED:
-                       (void) fprintf(stderr, gettext("property may be set "
-                           "but unable to remount filesystem\n"));
+               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 EZFS_SHARENFSFAILED:
-                       (void) fprintf(stderr, gettext("property may be set "
-                           "but unable to reshare filesystem\n"));
+               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:
                        break;
                }
-               return (1);
+
+               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;
+                       }
+               }
+
+               (void) parse_who_perm(who_perm, nvl2, perm_locality);
        }
+
        return (0);
 }
 
-static int
-zfs_do_set(int argc, char **argv)
+static inline int
+parse_fs_perm_set(fs_perm_set_t *fspset, nvlist_t *nvl)
 {
-       set_cbdata_t cb;
-       int ret;
+       nvpair_t *nvp = NULL;
+       uu_avl_index_t idx = 0;
 
-       /* check for options */
-       if (argc > 1 && argv[1][0] == '-') {
-               (void) fprintf(stderr, gettext("invalid option '%c'\n"),
-                   argv[1][1]);
-               usage(B_FALSE);
-       }
+       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();
 
-       /* check number of arguments */
-       if (argc < 2) {
-               (void) fprintf(stderr, gettext("missing property=value "
-                   "argument\n"));
-               usage(B_FALSE);
-       }
-       if (argc < 3) {
-               (void) fprintf(stderr, gettext("missing dataset name\n"));
-               usage(B_FALSE);
-       }
+               fsperm = &node->fspn_fsperm;
 
-       /* 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"));
-               usage(B_FALSE);
-       }
+               VERIFY(DATA_TYPE_NVLIST == type);
 
-       *cb.cb_value = '\0';
-       cb.cb_value++;
+               uu_list_node_init(node, &node->fspn_list_node,
+                   fspset->fsps_list_pool);
 
-       if (*cb.cb_propname == '\0') {
-               (void) fprintf(stderr,
-                   gettext("missing property in property=value argument\n"));
-               usage(B_FALSE);
-       }
+               idx = uu_list_numnodes(fspset->fsps_list);
+               fs_perm_init(fsperm, fspset, fsname);
+
+               if (nvpair_value_nvlist(nvp, &nvl2) != 0)
+                       return (-1);
 
-       ret = zfs_for_each(argc - 2, argv + 2, NULL,
-           ZFS_TYPE_DATASET, NULL, NULL, set_callback, &cb);
+               (void) parse_fs_perm(fsperm, nvl2);
 
-       return (ret);
+               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;
 /*
- * zfs snapshot [-r] [-o prop=value] ... <fs@snap>
- *
- * Creates a snapshot with the given name.  While functionally equivalent to
- * 'zfs create', it is a separate command to differentiate intent.
+ *     case ZFS_DELEG_NOTE_VSCAN:
+ *             str = gettext("");
+ *             break;
  */
-static int
-zfs_do_snapshot(int argc, char **argv)
+               /* 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;
+               /* 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)
 {
-       boolean_t recursive = B_FALSE;
-       int ret;
-       char c;
-       nvlist_t *props;
+       const char *str1 = *(const char **)a;
+       const char *str2 = *(const char **)b;
+       return (strcmp(str1, str2));
+}
 
-       if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0) {
-               (void) fprintf(stderr, gettext("internal error: "
-                   "out of memory\n"));
-               return (1);
+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++) {
+               const char *opt = opt_desc[i++];
+               const char *optdsc = opt_desc[i];
+               (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;
 
-       /* check options */
-       while ((c = getopt(argc, argv, "ro:")) != -1) {
-               switch (c) {
-               case 'o':
-                       if (parseprop(props))
-                               return (1);
-                       break;
-               case 'r':
-                       recursive = B_TRUE;
-                       break;
-               case '?':
-                       (void) fprintf(stderr, gettext("invalid option '%c'\n"),
-                           optopt);
-                       goto usage;
-               }
+       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);
        }
 
-       argc -= optind;
-       argv += optind;
+       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];
+       }
 
-       /* check number of arguments */
-       if (argc < 1) {
-               (void) fprintf(stderr, gettext("missing snapshot argument\n"));
-               goto usage;
+       if (!opts->local && !opts->descend) {
+               opts->local = B_TRUE;
+               opts->descend = B_TRUE;
        }
-       if (argc > 1) {
-               (void) fprintf(stderr, gettext("too many arguments\n"));
-               goto usage;
+}
+
+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[ZFS_MAXNAMELEN+32];
+       char base_type = ZFS_DELEG_WHO_UNKNOWN;
+       char set_type = ZFS_DELEG_WHO_UNKNOWN;
+       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;
+       default:
+               break;
        }
 
-       ret = zfs_snapshot(g_zfs, argv[0], recursive, props);
-       nvlist_free(props);
-       if (ret && recursive)
-               (void) fprintf(stderr, gettext("no snapshots were created\n"));
-       return (ret != 0);
+       if (perms != NULL) {
+               char *curr = perms;
+               char *end = curr + strlen(perms);
 
-usage:
-       nvlist_free(props);
-       usage(B_FALSE);
-       return (-1);
-}
+               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);
+               }
+       }
+}
 
-/*
- * zfs send [-v] -R [-i|-I <@snap>] <fs@snap>
- * zfs send [-v] [-i|-I <@snap>] <fs@snap>
- *
- * Send a backup stream to stdout.
- */
 static int
-zfs_do_send(int argc, char **argv)
+construct_fsacl_list(boolean_t un, struct allow_opts *opts, nvlist_t **nvlp)
 {
-       char *fromname = NULL;
-       char *toname = NULL;
-       char *cp;
-       zfs_handle_t *zhp;
-       boolean_t doall = B_FALSE;
-       boolean_t replicate = B_FALSE;
-       boolean_t fromorigin = B_FALSE;
-       boolean_t verbose = B_FALSE;
-       int c, err;
+       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);
+                               }
 
-       /* check options */
-       while ((c = getopt(argc, argv, ":i:I:Rv")) != -1) {
-               switch (c) {
-               case 'i':
-                       if (fromname)
-                               usage(B_FALSE);
-                       fromname = optarg;
-                       break;
-               case 'I':
-                       if (fromname)
-                               usage(B_FALSE);
-                       fromname = optarg;
-                       doall = B_TRUE;
-                       break;
-               case 'R':
-                       replicate = B_TRUE;
-                       break;
-               case 'v':
-                       verbose = 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);
+                               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;
                }
        }
 
-       argc -= optind;
-       argv += optind;
+       return (0);
+}
 
-       /* 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);
-       }
+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 (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);
-       }
+               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);
+               }
 
-       cp = strchr(argv[0], '@');
-       if (cp == NULL) {
-               (void) fprintf(stderr,
-                   gettext("argument must be a snapshot\n"));
-               usage(B_FALSE);
+               (void) printf("\n");
        }
-       *cp = '\0';
-       toname = cp + 1;
-       zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
-       if (zhp == NULL)
-               return (1);
+}
 
-       /*
-        * If they specified the full path to the snapshot, chop off
-        * everything except the short name of the snapshot, but special
-        * case if they specify the origin.
-        */
-       if (fromname && (cp = strchr(fromname, '@')) != NULL) {
-               char origin[ZFS_MAXNAMELEN];
-               zprop_source_t src;
+static void inline
+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;
 
-               (void) zfs_prop_get(zhp, ZFS_PROP_ORIGIN,
-                   origin, sizeof (origin), &src, NULL, 0, B_FALSE);
+                       if (prt_who) {
+                               const char *who = NULL;
+                               if (prt_title) {
+                                       prt_title = B_FALSE;
+                                       (void) printf("%s", title);
+                               }
 
-               if (strcmp(origin, fromname) == 0) {
-                       fromname = NULL;
-                       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);
+                               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;
+                               default:
+                                       break;
+                               }
+
+                               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 (!prt_who)
+                       (void) printf("\n");
        }
 
-       if (replicate && fromname == NULL)
-               doall = B_TRUE;
+       uu_avl_walk_end(walk);
+}
 
-       err = zfs_send(zhp, fromname, toname, replicate, doall, fromorigin,
-           verbose, STDOUT_FILENO);
-       zfs_close(zhp);
+static void
+print_fs_perms(fs_perm_set_t *fspset)
+{
+       fs_perm_node_t *node = NULL;
+       char buf[ZFS_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, ZFS_MAXNAMELEN+32,
+                   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"));
+       }
+}
 
-       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 [-dnvF] <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;
+       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 };
 
-       bzero(&flags, sizeof (recvflags_t));
-       /* check options */
-       while ((c = getopt(argc, argv, ":dnvF")) != -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 'n':
-                       flags.dryrun = B_TRUE;
+               case 'u':
+                       opts.user = B_TRUE;
                        break;
-               case 'v':
-                       flags.verbose = B_TRUE;
+               case 'g':
+                       opts.group = B_TRUE;
                        break;
-               case 'F':
-                       flags.force = B_TRUE;
+               case 'e':
+                       opts.everyone = B_TRUE;
+                       break;
+               case 's':
+                       opts.set = B_TRUE;
+                       break;
+               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);
@@ -2469,420 +4978,383 @@ 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);
-       }
-       if (argc > 1) {
-               (void) fprintf(stderr, gettext("too many arguments\n"));
-               usage(B_FALSE);
-       }
+       /* check arguments */
+       parse_allow_args(argc, argv, un, &opts);
 
-       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);
+       /* 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);
        }
 
-       err = zfs_receive(g_zfs, argv[0], flags, STDIN_FILENO, NULL);
+       if (zfs_get_fsacl(zhp, &perm_nvl) != 0)
+               goto cleanup2;
 
-       return (err != 0);
-}
+       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;
+       }
 
-typedef struct allow_cb {
-       int  a_permcnt;
-       size_t a_treeoffset;
-} allow_cb_t;
+       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;
 
-static void
-zfs_print_perms(avl_tree_t *tree)
-{
-       zfs_perm_node_t *permnode;
-
-       permnode = avl_first(tree);
-       while (permnode != NULL) {
-               (void) printf("%s", permnode->z_pname);
-               permnode = AVL_NEXT(tree, permnode);
-               if (permnode)
-                       (void) printf(",");
-               else
-                       (void) printf("\n");
+               if (un && opts.recursive) {
+                       struct deleg_perms data = { un, update_perm_nvl };
+                       if (zfs_iter_filesystems(zhp, set_deleg_perms,
+                           &data) != 0)
+                               goto cleanup0;
+               }
        }
+
+       error = 0;
+
+cleanup0:
+       nvlist_free(perm_nvl);
+       if (update_perm_nvl != NULL)
+               nvlist_free(update_perm_nvl);
+cleanup1:
+       fs_perm_set_fini(&fs_perm_set);
+cleanup2:
+       zfs_close(zhp);
+
+       return (error);
 }
 
 /*
- * Iterate over user/groups/everyone/... and the call perm_iter
- * function to print actual permission when tree has >0 nodes.
+ * zfs allow [-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.
  */
-static void
-zfs_iter_perms(avl_tree_t *tree, const char *banner, allow_cb_t *cb)
+static int
+zfs_do_allow(int argc, char **argv)
 {
-       zfs_allow_node_t *item;
-       avl_tree_t *ptree;
-
-       item = avl_first(tree);
-       while (item) {
-               ptree = (void *)((char *)item + cb->a_treeoffset);
-               if (avl_numnodes(ptree)) {
-                       if (cb->a_permcnt++ == 0)
-                               (void) printf("%s\n", banner);
-                       (void) printf("\t%s", item->z_key);
-                       /*
-                        * Avoid an extra space being printed
-                        * for "everyone" which is keyed with a null
-                        * string
-                        */
-                       if (item->z_key[0] != '\0')
-                               (void) printf(" ");
-                       zfs_print_perms(ptree);
-               }
-               item = AVL_NEXT(tree, item);
-       }
+       return (zfs_do_allow_unallow_impl(argc, argv, B_FALSE));
 }
 
-#define        LINES "-------------------------------------------------------------\n"
+/*
+ * zfs unallow [-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.
+ */
 static int
-zfs_print_allows(char *ds)
+zfs_do_unallow(int argc, char **argv)
 {
-       zfs_allow_t *curperms, *perms;
-       zfs_handle_t *zhp;
-       allow_cb_t allowcb = { 0 };
-       char banner[MAXPATHLEN];
-
-       if (ds[0] == '-')
-               usage(B_FALSE);
-
-       if (strrchr(ds, '@')) {
-               (void) fprintf(stderr, gettext("Snapshots don't have 'allow'"
-                   " permissions\n"));
-               return (1);
-       }
-       if ((zhp = zfs_open(g_zfs, ds, ZFS_TYPE_DATASET)) == NULL)
-               return (1);
-
-       if (zfs_perm_get(zhp, &perms)) {
-               (void) fprintf(stderr,
-                   gettext("Failed to retrieve 'allows' on %s\n"), ds);
-               zfs_close(zhp);
-               return (1);
-       }
-
-       zfs_close(zhp);
-
-       if (perms != NULL)
-               (void) printf("%s", LINES);
-       for (curperms = perms; curperms; curperms = curperms->z_next) {
-
-               (void) snprintf(banner, sizeof (banner),
-                   gettext("Permission sets on (%s)"), curperms->z_setpoint);
-               allowcb.a_treeoffset =
-                   offsetof(zfs_allow_node_t, z_localdescend);
-               allowcb.a_permcnt = 0;
-               zfs_iter_perms(&curperms->z_sets, banner, &allowcb);
-
-               (void) snprintf(banner, sizeof (banner),
-                   gettext("Create time permissions on (%s)"),
-                   curperms->z_setpoint);
-               allowcb.a_treeoffset =
-                   offsetof(zfs_allow_node_t, z_localdescend);
-               allowcb.a_permcnt = 0;
-               zfs_iter_perms(&curperms->z_crperms, banner, &allowcb);
-
-
-               (void) snprintf(banner, sizeof (banner),
-                   gettext("Local permissions on (%s)"), curperms->z_setpoint);
-               allowcb.a_treeoffset = offsetof(zfs_allow_node_t, z_local);
-               allowcb.a_permcnt = 0;
-               zfs_iter_perms(&curperms->z_user, banner, &allowcb);
-               zfs_iter_perms(&curperms->z_group, banner, &allowcb);
-               zfs_iter_perms(&curperms->z_everyone, banner, &allowcb);
-
-               (void) snprintf(banner, sizeof (banner),
-                   gettext("Descendent permissions on (%s)"),
-                   curperms->z_setpoint);
-               allowcb.a_treeoffset = offsetof(zfs_allow_node_t, z_descend);
-               allowcb.a_permcnt = 0;
-               zfs_iter_perms(&curperms->z_user, banner, &allowcb);
-               zfs_iter_perms(&curperms->z_group, banner, &allowcb);
-               zfs_iter_perms(&curperms->z_everyone, banner, &allowcb);
-
-               (void) snprintf(banner, sizeof (banner),
-                   gettext("Local+Descendent permissions on (%s)"),
-                   curperms->z_setpoint);
-               allowcb.a_treeoffset =
-                   offsetof(zfs_allow_node_t, z_localdescend);
-               allowcb.a_permcnt = 0;
-               zfs_iter_perms(&curperms->z_user, banner, &allowcb);
-               zfs_iter_perms(&curperms->z_group, banner, &allowcb);
-               zfs_iter_perms(&curperms->z_everyone, banner, &allowcb);
-
-               (void) printf("%s", LINES);
-       }
-       zfs_free_allows(perms);
-       return (0);
+       return (zfs_do_allow_unallow_impl(argc, argv, B_TRUE));
 }
 
-#define        ALLOWOPTIONS "ldcsu:g:e"
-#define        UNALLOWOPTIONS "ldcsu:g:er"
-
-/*
- * Validate options, and build necessary datastructure to display/remove/add
- * permissions.
- * Returns 0 - If permissions should be added/removed
- * Returns 1 - If permissions should be displayed.
- * Returns -1 - on failure
- */
-int
-parse_allow_args(int *argc, char **argv[], boolean_t unallow,
-    char **ds, int *recurse, nvlist_t **zperms)
+static int
+zfs_do_hold_rele_impl(int argc, char **argv, boolean_t holding)
 {
+       int errors = 0;
+       int i;
+       const char *tag;
+       boolean_t recursive = B_FALSE;
+       boolean_t temphold = B_FALSE;
+       const char *opts = holding ? "rt" : "r";
        int c;
-       char *options = unallow ? UNALLOWOPTIONS : ALLOWOPTIONS;
-       zfs_deleg_inherit_t deleg_type = ZFS_DELEG_NONE;
-       zfs_deleg_who_type_t who_type = ZFS_DELEG_WHO_UNKNOWN;
-       char *who = NULL;
-       char *perms = NULL;
-       zfs_handle_t *zhp;
 
-       while ((c = getopt(*argc, *argv, options)) != -1) {
+       /* check options */
+       while ((c = getopt(argc, argv, opts)) != -1) {
                switch (c) {
-               case 'l':
-                       if (who_type == ZFS_DELEG_CREATE ||
-                           who_type == ZFS_DELEG_NAMED_SET)
-                               usage(B_FALSE);
-
-                       deleg_type |= ZFS_DELEG_PERM_LOCAL;
-                       break;
-               case 'd':
-                       if (who_type == ZFS_DELEG_CREATE ||
-                           who_type == ZFS_DELEG_NAMED_SET)
-                               usage(B_FALSE);
-
-                       deleg_type |= ZFS_DELEG_PERM_DESCENDENT;
-                       break;
                case 'r':
-                       *recurse = B_TRUE;
-                       break;
-               case 'c':
-                       if (who_type != ZFS_DELEG_WHO_UNKNOWN)
-                               usage(B_FALSE);
-                       if (deleg_type)
-                               usage(B_FALSE);
-                       who_type = ZFS_DELEG_CREATE;
-                       break;
-               case 's':
-                       if (who_type != ZFS_DELEG_WHO_UNKNOWN)
-                               usage(B_FALSE);
-                       if (deleg_type)
-                               usage(B_FALSE);
-                       who_type = ZFS_DELEG_NAMED_SET;
-                       break;
-               case 'u':
-                       if (who_type != ZFS_DELEG_WHO_UNKNOWN)
-                               usage(B_FALSE);
-                       who_type = ZFS_DELEG_USER;
-                       who = optarg;
-                       break;
-               case 'g':
-                       if (who_type != ZFS_DELEG_WHO_UNKNOWN)
-                               usage(B_FALSE);
-                       who_type = ZFS_DELEG_GROUP;
-                       who = optarg;
+                       recursive = B_TRUE;
                        break;
-               case 'e':
-                       if (who_type != ZFS_DELEG_WHO_UNKNOWN)
-                               usage(B_FALSE);
-                       who_type = ZFS_DELEG_EVERYONE;
+               case 't':
+                       temphold = B_TRUE;
                        break;
-               default:
+               case '?':
+                       (void) fprintf(stderr, gettext("invalid option '%c'\n"),
+                           optopt);
                        usage(B_FALSE);
-                       break;
                }
        }
 
-       if (deleg_type == 0)
-               deleg_type = ZFS_DELEG_PERM_LOCALDESCENDENT;
+       argc -= optind;
+       argv += optind;
 
-       *argc -= optind;
-       *argv += optind;
+       /* check number of arguments */
+       if (argc < 2)
+               usage(B_FALSE);
 
-       if (unallow == B_FALSE && *argc == 1) {
-               /*
-                * Only print permissions if no options were processed
-                */
-               if (optind == 1)
-                       return (1);
-               else
-                       usage(B_FALSE);
-       }
+       tag = argv[0];
+       --argc;
+       ++argv;
 
-       /*
-        * initialize variables for zfs_build_perms based on number
-        * of arguments.
-        * 3 arguments ==>      zfs [un]allow joe perm,perm,perm <dataset> or
-        *                      zfs [un]allow -s @set1 perm,perm <dataset>
-        * 2 arguments ==>      zfs [un]allow -c perm,perm <dataset> or
-        *                      zfs [un]allow -u|-g <name> perm <dataset> or
-        *                      zfs [un]allow -e perm,perm <dataset>
-        *                      zfs unallow joe <dataset>
-        *                      zfs unallow -s @set1 <dataset>
-        * 1 argument  ==>      zfs [un]allow -e <dataset> or
-        *                      zfs [un]allow -c <dataset>
-        */
+       if (holding && tag[0] == '.') {
+               /* tags starting with '.' are reserved for libzfs */
+               (void) fprintf(stderr, gettext("tag may not start with '.'\n"));
+               usage(B_FALSE);
+       }
 
-       switch (*argc) {
-       case 3:
-               perms = (*argv)[1];
-               who = (*argv)[0];
-               *ds = (*argv)[2];
+       for (i = 0; i < argc; ++i) {
+               zfs_handle_t *zhp;
+               char parent[ZFS_MAXNAMELEN];
+               const char *delim;
+               char *path = argv[i];
 
-               /*
-                * advance argc/argv for do_allow cases.
-                * for do_allow case make sure who have a know who type
-                * and its not a permission set.
-                */
-               if (unallow == B_TRUE) {
-                       *argc -= 2;
-                       *argv += 2;
-               } else if (who_type != ZFS_DELEG_WHO_UNKNOWN &&
-                   who_type != ZFS_DELEG_NAMED_SET)
-                       usage(B_FALSE);
-               break;
+               delim = strchr(path, '@');
+               if (delim == NULL) {
+                       (void) fprintf(stderr,
+                           gettext("'%s' is not a snapshot\n"), path);
+                       ++errors;
+                       continue;
+               }
+               (void) strncpy(parent, path, delim - path);
+               parent[delim - path] = '\0';
 
-       case 2:
-               if (unallow == B_TRUE && (who_type == ZFS_DELEG_EVERYONE ||
-                   who_type == ZFS_DELEG_CREATE || who != NULL)) {
-                       perms = (*argv)[0];
-                       *ds = (*argv)[1];
-               } else {
-                       if (unallow == B_FALSE &&
-                           (who_type == ZFS_DELEG_WHO_UNKNOWN ||
-                           who_type == ZFS_DELEG_NAMED_SET))
-                               usage(B_FALSE);
-                       else if (who_type == ZFS_DELEG_WHO_UNKNOWN ||
-                           who_type == ZFS_DELEG_NAMED_SET)
-                               who = (*argv)[0];
-                       else if (who_type != ZFS_DELEG_NAMED_SET)
-                               perms = (*argv)[0];
-                       *ds = (*argv)[1];
+               zhp = zfs_open(g_zfs, parent,
+                   ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
+               if (zhp == NULL) {
+                       ++errors;
+                       continue;
                }
-               if (unallow == B_TRUE) {
-                       (*argc)--;
-                       (*argv)++;
+               if (holding) {
+                       if (zfs_hold(zhp, delim+1, tag, recursive,
+                           temphold, B_FALSE, -1, 0, 0) != 0)
+                               ++errors;
+               } else {
+                       if (zfs_release(zhp, delim+1, tag, recursive) != 0)
+                               ++errors;
                }
-               break;
+               zfs_close(zhp);
+       }
 
-       case 1:
-               if (unallow == B_FALSE)
-                       usage(B_FALSE);
-               if (who == NULL && who_type != ZFS_DELEG_CREATE &&
-                   who_type != ZFS_DELEG_EVERYONE)
-                       usage(B_FALSE);
-               *ds = (*argv)[0];
-               break;
+       return (errors != 0);
+}
 
-       default:
-               usage(B_FALSE);
-       }
+/*
+ * 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.
+ */
+static int
+zfs_do_hold(int argc, char **argv)
+{
+       return (zfs_do_hold_rele_impl(argc, argv, B_TRUE));
+}
 
-       if (strrchr(*ds, '@')) {
-               (void) fprintf(stderr,
-                   gettext("Can't set or remove 'allow' permissions "
-                   "on snapshots.\n"));
-                       return (-1);
-       }
+/*
+ * zfs release [-r] <tag> <snap> ...
+ *
+ *     -r      Recursively release
+ *
+ * Release a user-hold with the given tag from the list of snapshots.
+ */
+static int
+zfs_do_release(int argc, char **argv)
+{
+       return (zfs_do_hold_rele_impl(argc, argv, B_FALSE));
+}
 
-       if ((zhp = zfs_open(g_zfs, *ds, ZFS_TYPE_DATASET)) == NULL)
-               return (-1);
+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;
 
-       if ((zfs_build_perms(zhp, who, perms,
-           who_type, deleg_type, zperms)) != 0) {
-               zfs_close(zhp);
-               return (-1);
+#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);
+               }
        }
-       zfs_close(zhp);
-       return (0);
 }
 
+/*
+ * Generic callback function to list a dataset or snapshot.
+ */
 static int
-zfs_do_allow(int argc, char **argv)
+holds_callback(zfs_handle_t *zhp, void *data)
 {
-       char *ds;
-       nvlist_t *zperms = NULL;
-       zfs_handle_t *zhp;
-       int unused;
-       int ret;
+       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 = strnlen(zname, ZFS_MAXNAMELEN);
+
+       if (cbp->cb_recursive) {
+               const char *snapname;
+               char *delim  = strchr(zname, '@');
+               if (delim == NULL)
+                       return (0);
 
-       if ((ret = parse_allow_args(&argc, &argv, B_FALSE, &ds,
-           &unused, &zperms)) == -1)
-               return (1);
+               snapname = delim + 1;
+               if (strcmp(cbp->cb_snapname, snapname))
+                       return (0);
+       }
 
-       if (ret == 1)
-               return (zfs_print_allows(argv[0]));
+       if (zfs_get_holds(zhp, &nvl) != 0)
+               return (-1);
 
-       if ((zhp = zfs_open(g_zfs, ds, ZFS_TYPE_DATASET)) == NULL)
-               return (1);
+       if (znamelen > cbp->cb_max_namelen)
+               cbp->cb_max_namelen  = znamelen;
 
-       if (zfs_perm_set(zhp, zperms)) {
-               zfs_close(zhp);
-               nvlist_free(zperms);
-               return (1);
+       while ((nvp = nvlist_next_nvpair(nvl, nvp)) != NULL) {
+               const char *tag = nvpair_name(nvp);
+               size_t taglen = strnlen(tag, MAXNAMELEN);
+               if (taglen > cbp->cb_max_taglen)
+                       cbp->cb_max_taglen  = taglen;
        }
-       nvlist_free(zperms);
-       zfs_close(zhp);
 
-       return (0);
+       return (nvlist_add_nvlist(top_nvl, zname, nvl));
 }
 
+/*
+ * zfs holds [-r] <snap> ...
+ *
+ *     -r      Recursively hold
+ */
 static int
-unallow_callback(zfs_handle_t *zhp, void *data)
+zfs_do_holds(int argc, char **argv)
 {
-       nvlist_t *nvp = (nvlist_t *)data;
-       int error;
+       int errors = 0;
+       int c;
+       int i;
+       boolean_t scripted = B_FALSE;
+       boolean_t recursive = B_FALSE;
+       const char *opts = "rH";
+       nvlist_t *nvl;
 
-       error = zfs_perm_remove(zhp, nvp);
-       if (error) {
-               (void) fprintf(stderr, gettext("Failed to remove permissions "
-                   "on %s\n"), zfs_get_name(zhp));
-       }
-       return (error);
-}
+       int types = ZFS_TYPE_SNAPSHOT;
+       holds_cbdata_t cb = { 0 };
 
-static int
-zfs_do_unallow(int argc, char **argv)
-{
-       int recurse = B_FALSE;
-       char *ds;
-       int error;
-       nvlist_t *zperms = NULL;
+       int limit = 0;
+       int ret = 0;
        int flags = 0;
 
-       if (parse_allow_args(&argc, &argv, B_TRUE,
-           &ds, &recurse, &zperms) == -1)
-               return (1);
+       /* 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 (recurse)
+       if (recursive) {
+               types |= ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME;
                flags |= ZFS_ITER_RECURSE;
-       error = zfs_for_each(argc, argv, flags,
-           ZFS_TYPE_FILESYSTEM|ZFS_TYPE_VOLUME, NULL,
-           NULL, unallow_callback, (void *)zperms);
+       }
 
-       if (zperms)
-               nvlist_free(zperms);
+       argc -= optind;
+       argv += optind;
 
-       return (error);
-}
+       /* check number of arguments */
+       if (argc < 1)
+               usage(B_FALSE);
 
-typedef struct get_all_cbdata {
-       zfs_handle_t    **cb_handles;
-       size_t          cb_alloc;
-       size_t          cb_used;
-       uint_t          cb_types;
-       boolean_t       cb_verbose;
-} get_all_cbdata_t;
+       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 */
@@ -2891,19 +5363,18 @@ typedef struct get_all_cbdata {
 static int
 get_one_dataset(zfs_handle_t *zhp, void *data)
 {
-       static char spin[] = { '-', '\\', '|', '/' };
+       static char *spin[] = { "-", "\\", "|", "/" };
        static int spinval = 0;
        static int spincheck = 0;
        static time_t last_spin_time = (time_t)0;
-       get_all_cbdata_t *cbp = data;
+       get_all_cb_t *cbp = data;
        zfs_type_t type = zfs_get_type(zhp);
 
        if (cbp->cb_verbose) {
                if (--spincheck < 0) {
                        time_t now = time(NULL);
                        if (last_spin_time + SPINNER_TIME < now) {
-                               (void) printf("\b%c", spin[spinval++ % 4]);
-                               (void) fflush(stdout);
+                               update_progress(spin[spinval++ % 4]);
                                last_spin_time = now;
                        }
                        spincheck = CHECK_SPINNER;
@@ -2911,10 +5382,9 @@ get_one_dataset(zfs_handle_t *zhp, void *data)
        }
 
        /*
-        * Interate over any nested datasets.
+        * Iterate over any nested datasets.
         */
-       if (type == ZFS_TYPE_FILESYSTEM &&
-           zfs_iter_filesystems(zhp, get_one_dataset, data) != 0) {
+       if (zfs_iter_filesystems(zhp, get_one_dataset, data) != 0) {
                zfs_close(zhp);
                return (1);
        }
@@ -2922,83 +5392,32 @@ get_one_dataset(zfs_handle_t *zhp, void *data)
        /*
         * Skip any datasets whose type does not match.
         */
-       if ((type & cbp->cb_types) == 0) {
+       if ((type & ZFS_TYPE_FILESYSTEM) == 0) {
                zfs_close(zhp);
                return (0);
        }
-
-       if (cbp->cb_alloc == cbp->cb_used) {
-               zfs_handle_t **handles;
-
-               if (cbp->cb_alloc == 0)
-                       cbp->cb_alloc = 64;
-               else
-                       cbp->cb_alloc *= 2;
-
-               handles = safe_malloc(cbp->cb_alloc * sizeof (void *));
-
-               if (cbp->cb_handles) {
-                       bcopy(cbp->cb_handles, handles,
-                           cbp->cb_used * sizeof (void *));
-                       free(cbp->cb_handles);
-               }
-
-               cbp->cb_handles = handles;
-       }
-
-       cbp->cb_handles[cbp->cb_used++] = zhp;
+       libzfs_add_handle(cbp, zhp);
+       assert(cbp->cb_used <= cbp->cb_alloc);
 
        return (0);
 }
 
 static void
-get_all_datasets(uint_t types, zfs_handle_t ***dslist, size_t *count,
-    boolean_t verbose)
+get_all_datasets(zfs_handle_t ***dslist, size_t *count, boolean_t verbose)
 {
-       get_all_cbdata_t cb = { 0 };
-       cb.cb_types = types;
+       get_all_cb_t cb = { 0 };
        cb.cb_verbose = verbose;
+       cb.cb_getone = get_one_dataset;
 
-       if (verbose) {
-               (void) printf("%s: *", gettext("Reading ZFS config"));
-               (void) fflush(stdout);
-       }
-
+       if (verbose)
+               set_progress_header(gettext("Reading ZFS config"));
        (void) zfs_iter_root(g_zfs, get_one_dataset, &cb);
 
        *dslist = cb.cb_handles;
        *count = cb.cb_used;
 
-       if (verbose) {
-               (void) printf("\b%s\n", gettext("done."));
-       }
-}
-
-static int
-dataset_cmp(const void *a, const void *b)
-{
-       zfs_handle_t **za = (zfs_handle_t **)a;
-       zfs_handle_t **zb = (zfs_handle_t **)b;
-       char mounta[MAXPATHLEN];
-       char mountb[MAXPATHLEN];
-       boolean_t gota, gotb;
-
-       if ((gota = (zfs_get_type(*za) == ZFS_TYPE_FILESYSTEM)) != 0)
-               verify(zfs_prop_get(*za, ZFS_PROP_MOUNTPOINT, mounta,
-                   sizeof (mounta), NULL, NULL, 0, B_FALSE) == 0);
-       if ((gotb = (zfs_get_type(*zb) == ZFS_TYPE_FILESYSTEM)) != 0)
-               verify(zfs_prop_get(*zb, ZFS_PROP_MOUNTPOINT, mountb,
-                   sizeof (mountb), NULL, NULL, 0, B_FALSE) == 0);
-
-       if (gota && gotb)
-               return (strcmp(mounta, mountb));
-
-       if (gota)
-               return (-1);
-       if (gotb)
-               return (1);
-
-       return (strcmp(zfs_get_name(a), zfs_get_name(b)));
+       if (verbose)
+               finish_progress(gettext("done."));
 }
 
 /*
@@ -3022,216 +5441,179 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol,
        const char *cmdname = op == OP_SHARE ? "share" : "mount";
        struct mnttab mnt;
        uint64_t zoned, canmount;
-       zfs_type_t type = zfs_get_type(zhp);
        boolean_t shared_nfs, shared_smb;
 
-       assert(type & (ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME));
-
-       if (type == ZFS_TYPE_FILESYSTEM) {
-               /*
-                * Check to make sure we can mount/share this dataset.  If we
-                * are in the global zone and the filesystem is exported to a
-                * local zone, or if we are in a local zone and the
-                * filesystem is not exported, then it is an error.
-                */
-               zoned = zfs_prop_get_int(zhp, ZFS_PROP_ZONED);
-
-               if (zoned && getzoneid() == GLOBAL_ZONEID) {
-                       if (!explicit)
-                               return (0);
-
-                       (void) fprintf(stderr, gettext("cannot %s '%s': "
-                           "dataset is exported to a local zone\n"), cmdname,
-                           zfs_get_name(zhp));
-                       return (1);
-
-               } else if (!zoned && getzoneid() != GLOBAL_ZONEID) {
-                       if (!explicit)
-                               return (0);
-
-                       (void) fprintf(stderr, gettext("cannot %s '%s': "
-                           "permission denied\n"), cmdname,
-                           zfs_get_name(zhp));
-                       return (1);
-               }
-
-               /*
-                * Ignore any filesystems which don't apply to us. This
-                * includes those with a legacy mountpoint, or those with
-                * legacy share options.
-                */
-               verify(zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT, mountpoint,
-                   sizeof (mountpoint), NULL, NULL, 0, B_FALSE) == 0);
-               verify(zfs_prop_get(zhp, ZFS_PROP_SHARENFS, shareopts,
-                   sizeof (shareopts), NULL, NULL, 0, B_FALSE) == 0);
-               verify(zfs_prop_get(zhp, ZFS_PROP_SHARESMB, smbshareopts,
-                   sizeof (smbshareopts), NULL, NULL, 0, B_FALSE) == 0);
-
-               if (op == OP_SHARE && strcmp(shareopts, "off") == 0 &&
-                   strcmp(smbshareopts, "off") == 0) {
-                       if (!explicit)
-                               return (0);
-
-                       (void) fprintf(stderr, gettext("cannot share '%s': "
-                           "legacy share\n"), zfs_get_name(zhp));
-                       (void) fprintf(stderr, gettext("use share(1M) to "
-                           "share this filesystem, or set "
-                           "sharenfs property on\n"));
-                       return (1);
-               }
-
-               /*
-                * We cannot share or mount legacy filesystems. If the
-                * shareopts is non-legacy but the mountpoint is legacy, we
-                * treat it as a legacy share.
-                */
-               if (strcmp(mountpoint, "legacy") == 0) {
-                       if (!explicit)
-                               return (0);
-
-                       (void) fprintf(stderr, gettext("cannot %s '%s': "
-                           "legacy mountpoint\n"), cmdname, zfs_get_name(zhp));
-                       (void) fprintf(stderr, gettext("use %s(1M) to "
-                           "%s this filesystem\n"), cmdname, cmdname);
-                       return (1);
-               }
+       assert(zfs_get_type(zhp) & ZFS_TYPE_FILESYSTEM);
 
-               if (strcmp(mountpoint, "none") == 0) {
-                       if (!explicit)
-                               return (0);
+       /*
+        * Check to make sure we can mount/share this dataset.  If we
+        * are in the global zone and the filesystem is exported to a
+        * local zone, or if we are in a local zone and the
+        * filesystem is not exported, then it is an error.
+        */
+       zoned = zfs_prop_get_int(zhp, ZFS_PROP_ZONED);
 
-                       (void) fprintf(stderr, gettext("cannot %s '%s': no "
-                           "mountpoint set\n"), cmdname, zfs_get_name(zhp));
-                       return (1);
-               }
+       if (zoned && getzoneid() == GLOBAL_ZONEID) {
+               if (!explicit)
+                       return (0);
 
-               /*
-                * canmount     explicit        outcome
-                * on           no              pass through
-                * on           yes             pass through
-                * off          no              return 0
-                * off          yes             display error, return 1
-                * noauto       no              return 0
-                * noauto       yes             pass through
-                */
-               canmount = zfs_prop_get_int(zhp, ZFS_PROP_CANMOUNT);
-               if (canmount == ZFS_CANMOUNT_OFF) {
-                       if (!explicit)
-                               return (0);
+               (void) fprintf(stderr, gettext("cannot %s '%s': "
+                   "dataset is exported to a local zone\n"), cmdname,
+                   zfs_get_name(zhp));
+               return (1);
 
-                       (void) fprintf(stderr, gettext("cannot %s '%s': "
-                           "'canmount' property is set to 'off'\n"), cmdname,
-                           zfs_get_name(zhp));
-                       return (1);
-               } else if (canmount == ZFS_CANMOUNT_NOAUTO && !explicit) {
+       } else if (!zoned && getzoneid() != GLOBAL_ZONEID) {
+               if (!explicit)
                        return (0);
-               }
-
-               /*
-                * At this point, we have verified that the mountpoint and/or
-                * shareopts are appropriate for auto management. If the
-                * filesystem is already mounted or shared, return (failing
-                * for explicit requests); otherwise mount or share the
-                * filesystem.
-                */
-               switch (op) {
-               case OP_SHARE:
 
-                       shared_nfs = zfs_is_shared_nfs(zhp, NULL);
-                       shared_smb = zfs_is_shared_smb(zhp, NULL);
+               (void) fprintf(stderr, gettext("cannot %s '%s': "
+                   "permission denied\n"), cmdname,
+                   zfs_get_name(zhp));
+               return (1);
+       }
 
-                       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)) {
-                               if (!explicit)
-                                       return (0);
+       /*
+        * Ignore any filesystems which don't apply to us. This
+        * includes those with a legacy mountpoint, or those with
+        * legacy share options.
+        */
+       verify(zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT, mountpoint,
+           sizeof (mountpoint), NULL, NULL, 0, B_FALSE) == 0);
+       verify(zfs_prop_get(zhp, ZFS_PROP_SHARENFS, shareopts,
+           sizeof (shareopts), NULL, NULL, 0, B_FALSE) == 0);
+       verify(zfs_prop_get(zhp, ZFS_PROP_SHARESMB, smbshareopts,
+           sizeof (smbshareopts), NULL, NULL, 0, B_FALSE) == 0);
+
+       if (op == OP_SHARE && strcmp(shareopts, "off") == 0 &&
+           strcmp(smbshareopts, "off") == 0) {
+               if (!explicit)
+                       return (0);
 
-                               (void) fprintf(stderr, gettext("cannot share "
-                                   "'%s': filesystem already shared\n"),
-                                   zfs_get_name(zhp));
-                               return (1);
-                       }
+               (void) fprintf(stderr, gettext("cannot share '%s': "
+                   "legacy share\n"), zfs_get_name(zhp));
+               (void) fprintf(stderr, gettext("use share(1M) to "
+                   "share this filesystem, or set "
+                   "sharenfs property on\n"));
+               return (1);
+       }
 
-                       if (!zfs_is_mounted(zhp, NULL) &&
-                           zfs_mount(zhp, NULL, 0) != 0)
-                               return (1);
+       /*
+        * We cannot share or mount legacy filesystems. If the
+        * shareopts is non-legacy but the mountpoint is legacy, we
+        * treat it as a legacy share.
+        */
+       if (strcmp(mountpoint, "legacy") == 0) {
+               if (!explicit)
+                       return (0);
 
-                       if (protocol == NULL) {
-                               if (zfs_shareall(zhp) != 0)
-                                       return (1);
-                       } else if (strcmp(protocol, "nfs") == 0) {
-                               if (zfs_share_nfs(zhp))
-                                       return (1);
-                       } else if (strcmp(protocol, "smb") == 0) {
-                               if (zfs_share_smb(zhp))
-                                       return (1);
-                       } else {
-                               (void) fprintf(stderr, gettext("cannot share "
-                                   "'%s': invalid share type '%s' "
-                                   "specified\n"),
-                                   zfs_get_name(zhp), protocol);
-                               return (1);
-                       }
+               (void) fprintf(stderr, gettext("cannot %s '%s': "
+                   "legacy mountpoint\n"), cmdname, zfs_get_name(zhp));
+               (void) fprintf(stderr, gettext("use %s(1M) to "
+                   "%s this filesystem\n"), cmdname, cmdname);
+               return (1);
+       }
 
-                       break;
+       if (strcmp(mountpoint, "none") == 0) {
+               if (!explicit)
+                       return (0);
 
-               case OP_MOUNT:
-                       if (options == NULL)
-                               mnt.mnt_mntopts = "";
-                       else
-                               mnt.mnt_mntopts = (char *)options;
+               (void) fprintf(stderr, gettext("cannot %s '%s': no "
+                   "mountpoint set\n"), cmdname, zfs_get_name(zhp));
+               return (1);
+       }
 
-                       if (!hasmntopt(&mnt, MNTOPT_REMOUNT) &&
-                           zfs_is_mounted(zhp, NULL)) {
-                               if (!explicit)
-                                       return (0);
+       /*
+        * canmount     explicit        outcome
+        * on           no              pass through
+        * on           yes             pass through
+        * off          no              return 0
+        * off          yes             display error, return 1
+        * noauto       no              return 0
+        * noauto       yes             pass through
+        */
+       canmount = zfs_prop_get_int(zhp, ZFS_PROP_CANMOUNT);
+       if (canmount == ZFS_CANMOUNT_OFF) {
+               if (!explicit)
+                       return (0);
 
-                               (void) fprintf(stderr, gettext("cannot mount "
-                                   "'%s': filesystem already mounted\n"),
-                                   zfs_get_name(zhp));
-                               return (1);
-                       }
+               (void) fprintf(stderr, gettext("cannot %s '%s': "
+                   "'canmount' property is set to 'off'\n"), cmdname,
+                   zfs_get_name(zhp));
+               return (1);
+       } else if (canmount == ZFS_CANMOUNT_NOAUTO && !explicit) {
+               return (0);
+       }
 
-                       if (zfs_mount(zhp, options, flags) != 0)
-                               return (1);
-                       break;
-               }
-       } else {
-               assert(op == OP_SHARE);
+       /*
+        * At this point, we have verified that the mountpoint and/or
+        * shareopts are appropriate for auto management. If the
+        * filesystem is already mounted or shared, return (failing
+        * for explicit requests); otherwise mount or share the
+        * filesystem.
+        */
+       switch (op) {
+       case OP_SHARE:
 
-               /*
-                * Ignore any volumes that aren't shared.
-                */
-               verify(zfs_prop_get(zhp, ZFS_PROP_SHAREISCSI, shareopts,
-                   sizeof (shareopts), NULL, NULL, 0, B_FALSE) == 0);
+               shared_nfs = zfs_is_shared_nfs(zhp, NULL);
+               shared_smb = zfs_is_shared_smb(zhp, NULL);
 
-               if (strcmp(shareopts, "off") == 0) {
+               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))) {
                        if (!explicit)
                                return (0);
 
-                       (void) fprintf(stderr, gettext("cannot share '%s': "
-                           "'shareiscsi' property not set\n"),
+                       (void) fprintf(stderr, gettext("cannot share "
+                           "'%s': filesystem already shared\n"),
                            zfs_get_name(zhp));
-                       (void) fprintf(stderr, gettext("set 'shareiscsi' "
-                           "property or use iscsitadm(1M) to share this "
-                           "volume\n"));
                        return (1);
                }
 
-               if (zfs_is_shared_iscsi(zhp)) {
+               if (!zfs_is_mounted(zhp, NULL) &&
+                   zfs_mount(zhp, NULL, 0) != 0)
+                       return (1);
+
+               if (protocol == NULL) {
+                       if (zfs_shareall(zhp) != 0)
+                               return (1);
+               } else if (strcmp(protocol, "nfs") == 0) {
+                       if (zfs_share_nfs(zhp))
+                               return (1);
+               } else if (strcmp(protocol, "smb") == 0) {
+                       if (zfs_share_smb(zhp))
+                               return (1);
+               } else {
+                       (void) fprintf(stderr, gettext("cannot share "
+                           "'%s': invalid share type '%s' "
+                           "specified\n"),
+                           zfs_get_name(zhp), protocol);
+                       return (1);
+               }
+
+               break;
+
+       case OP_MOUNT:
+               if (options == NULL)
+                       mnt.mnt_mntopts = "";
+               else
+                       mnt.mnt_mntopts = (char *)options;
+
+               if (!hasmntopt(&mnt, MNTOPT_REMOUNT) &&
+                   zfs_is_mounted(zhp, NULL)) {
                        if (!explicit)
                                return (0);
 
-                       (void) fprintf(stderr, gettext("cannot share "
-                           "'%s': volume already shared\n"),
+                       (void) fprintf(stderr, gettext("cannot mount "
+                           "'%s': filesystem already mounted\n"),
                            zfs_get_name(zhp));
                        return (1);
                }
 
-               if (zfs_share_iscsi(zhp) != 0)
+               if (zfs_mount(zhp, options, flags) != 0)
                        return (1);
+               break;
        }
 
        return (0);
@@ -3243,19 +5625,16 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol,
 static void
 report_mount_progress(int current, int total)
 {
-       static int len;
-       static char *reverse = "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"
-           "\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b";
-       static time_t last_progress_time;
+       static time_t last_progress_time = 0;
        time_t now = time(NULL);
+       char info[32];
 
        /* report 1..n instead of 0..n-1 */
        ++current;
 
        /* display header if we're here for the first time */
        if (current == 1) {
-               (void) printf(gettext("Mounting ZFS filesystems: "));
-               len = 0;
+               set_progress_header(gettext("Mounting ZFS filesystems"));
        } else if (current != total && last_progress_time + MOUNT_TIME >= now) {
                /* too soon to report again */
                return;
@@ -3263,13 +5642,12 @@ report_mount_progress(int current, int total)
 
        last_progress_time = now;
 
-       /* back up to prepare for overwriting */
-       if (len)
-               (void) printf("%*.*s", len, len, reverse);
+       (void) sprintf(info, "(%d/%d)", current, total);
 
-       /* We put a newline at the end if this is the last one.  */
-       len = printf("(%d/%d)%s", current, total, current == total ? "\n" : "");
-       (void) fflush(stdout);
+       if (current == total)
+               finish_progress(info);
+       else
+               update_progress(info);
 }
 
 static void
@@ -3280,7 +5658,7 @@ append_options(char *mntopts, char *newopts)
        /* original length plus new string to append plus 1 for the comma */
        if (len + 1 + strlen(newopts) >= MNT_LINE_MAX) {
                (void) fprintf(stderr, gettext("the opts argument for "
-                   "'%c' option is too long (more than %d chars)\n"),
+                   "'%s' option is too long (more than %d chars)\n"),
                    "-o", MNT_LINE_MAX);
                usage(B_FALSE);
        }
@@ -3298,7 +5676,7 @@ share_mount(int op, int argc, char **argv)
        boolean_t verbose = B_FALSE;
        int c, ret = 0;
        char *options = NULL;
-       int types, flags = 0;
+       int flags = 0;
 
        /* check options */
        while ((c = getopt(argc, argv, op == OP_MOUNT ? ":avo:O" : "a"))
@@ -3323,7 +5701,6 @@ share_mount(int op, int argc, char **argv)
                        /* option validation is done later */
                        append_options(options, optarg);
                        break;
-
                case 'O':
                        flags |= MS_OVERLAY;
                        break;
@@ -3348,24 +5725,16 @@ share_mount(int op, int argc, char **argv)
                size_t i, count = 0;
                char *protocol = NULL;
 
-               if (op == OP_MOUNT) {
-                       types = ZFS_TYPE_FILESYSTEM;
-               } else if (argc > 0) {
-                       if (strcmp(argv[0], "nfs") == 0 ||
-                           strcmp(argv[0], "smb") == 0) {
-                               types = ZFS_TYPE_FILESYSTEM;
-                       } else if (strcmp(argv[0], "iscsi") == 0) {
-                               types = ZFS_TYPE_VOLUME;
-                       } else {
+               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', 'smb' or 'iscsi'\n"));
+                                   "must be 'nfs' or 'smb'\n"));
                                usage(B_FALSE);
                        }
                        protocol = argv[0];
                        argc--;
                        argv++;
-               } else {
-                       types = ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME;
                }
 
                if (argc != 0) {
@@ -3373,12 +5742,13 @@ share_mount(int op, int argc, char **argv)
                        usage(B_FALSE);
                }
 
-               get_all_datasets(types, &dslist, &count, verbose);
+               start_progress_timer();
+               get_all_datasets(&dslist, &count, verbose);
 
                if (count == 0)
                        return (0);
 
-               qsort(dslist, count, sizeof (void *), dataset_cmp);
+               qsort(dslist, count, sizeof (void *), libzfs_dataset_cmp);
 
                for (i = 0; i < count; i++) {
                        if (verbose)
@@ -3401,7 +5771,7 @@ share_mount(int op, int argc, char **argv)
                }
 
                /*
-                * When mount is given no arguments, go through /etc/mnttab and
+                * 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.
                 */
@@ -3418,17 +5788,14 @@ share_mount(int op, int argc, char **argv)
        } else {
                zfs_handle_t *zhp;
 
-               types = ZFS_TYPE_FILESYSTEM;
-               if (op == OP_SHARE)
-                       types |= ZFS_TYPE_VOLUME;
-
                if (argc > 1) {
                        (void) fprintf(stderr,
                            gettext("too many arguments\n"));
                        usage(B_FALSE);
                }
 
-               if ((zhp = zfs_open(g_zfs, argv[0], types)) == NULL) {
+               if ((zhp = zfs_open(g_zfs, argv[0],
+                   ZFS_TYPE_FILESYSTEM)) == NULL) {
                        ret = 1;
                } else {
                        ret = share_mount_one(zhp, op, flags, NULL, B_TRUE,
@@ -3441,7 +5808,7 @@ share_mount(int op, int argc, char **argv)
 }
 
 /*
- * zfs mount -a [nfs | iscsi]
+ * zfs mount -a [nfs]
  * zfs mount filesystem
  *
  * Mount all filesystems, or mount the given filesystem.
@@ -3453,7 +5820,7 @@ zfs_do_mount(int argc, char **argv)
 }
 
 /*
- * zfs share -a [nfs | iscsi | smb]
+ * zfs share -a [nfs | smb]
  * zfs share filesystem
  *
  * Share all filesystems, or share the given filesystem.
@@ -3482,21 +5849,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/mnttab, verify that its a ZFS filesystem,
+ * absolute path, find the entry /etc/mtab, verify that its a ZFS filesystem,
  * 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/mnttab.  Rather than looking for the
+        * Search for the path in /etc/mtab.  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.
@@ -3523,7 +5890,7 @@ 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 mnttab\n"),
+               (void) fprintf(stderr, gettext("warning: %s not in mtab\n"),
                    path);
                if ((ret = umount2(path, flags)) != 0)
                        (void) fprintf(stderr, gettext("%s: %s\n"), path,
@@ -3565,8 +5932,8 @@ unshare_unmount_path(int op, char *path, int flags, boolean_t is_manual)
                    strcmp(smbshare_prop, "off") == 0) {
                        (void) fprintf(stderr, gettext("cannot unshare "
                            "'%s': legacy share\n"), path);
-                       (void) fprintf(stderr, gettext("use "
-                           "unshare(1M) to unshare this filesystem\n"));
+                       (void) fprintf(stderr, gettext("use exportfs(8) "
+                           "or smbcontrol(1) to unshare this filesystem\n"));
                } else if (!zfs_is_shared(zhp)) {
                        (void) fprintf(stderr, gettext("cannot unshare '%s': "
                            "not currently shared\n"), path);
@@ -3585,7 +5952,7 @@ unshare_unmount_path(int op, char *path, int flags, boolean_t is_manual)
                        (void) fprintf(stderr, gettext("cannot unmount "
                            "'%s': legacy mountpoint\n"),
                            zfs_get_name(zhp));
-                       (void) fprintf(stderr, gettext("use umount(1M) "
+                       (void) fprintf(stderr, gettext("use umount(8) "
                            "to unmount this filesystem\n"));
                } else {
                        ret = zfs_unmountall(zhp, flags);
@@ -3607,9 +5974,9 @@ unshare_unmount(int op, int argc, char **argv)
        int do_all = 0;
        int flags = 0;
        int ret = 0;
-       int types, c;
+       int c;
        zfs_handle_t *zhp;
-       char nfsiscsi_mnt_prop[ZFS_MAXPROPLEN];
+       char nfs_mnt_prop[ZFS_MAXPROPLEN];
        char sharesmb[ZFS_MAXPROPLEN];
 
        /* check options */
@@ -3635,8 +6002,8 @@ 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/mnttab for each
-                * one.  Instead, do one pass through /etc/mnttab looking for
+                * 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.
                 *
                 * Things get a little tricky if the administrator has created
@@ -3648,7 +6015,7 @@ unshare_unmount(int op, int argc, char **argv)
                 */
                struct mnttab entry;
                uu_avl_pool_t *pool;
-               uu_avl_t *tree;
+               uu_avl_t *tree = NULL;
                unshare_unmount_node_t *node;
                uu_avl_index_t idx;
                uu_avl_walk_t *walk;
@@ -3658,21 +6025,12 @@ unshare_unmount(int op, int argc, char **argv)
                        usage(B_FALSE);
                }
 
-               if ((pool = uu_avl_pool_create("unmount_pool",
+               if (((pool = uu_avl_pool_create("unmount_pool",
                    sizeof (unshare_unmount_node_t),
                    offsetof(unshare_unmount_node_t, un_avlnode),
-                   unshare_unmount_compare,
-                   UU_DEFAULT)) == NULL) {
-                       (void) fprintf(stderr, gettext("internal error: "
-                           "out of memory\n"));
-                       exit(1);
-               }
-
-               if ((tree = uu_avl_create(pool, NULL, UU_DEFAULT)) == NULL) {
-                       (void) fprintf(stderr, gettext("internal error: "
-                           "out of memory\n"));
-                       exit(1);
-               }
+                   unshare_unmount_compare, UU_DEFAULT)) == NULL) ||
+                   ((tree = uu_avl_create(pool, NULL, UU_DEFAULT)) == NULL))
+                       nomem();
 
                rewind(mnttab_file);
                while (getmntent(mnttab_file, &entry) == 0) {
@@ -3694,25 +6052,25 @@ unshare_unmount(int op, int argc, char **argv)
                        switch (op) {
                        case OP_SHARE:
                                verify(zfs_prop_get(zhp, ZFS_PROP_SHARENFS,
-                                   nfsiscsi_mnt_prop,
-                                   sizeof (nfsiscsi_mnt_prop),
+                                   nfs_mnt_prop,
+                                   sizeof (nfs_mnt_prop),
                                    NULL, NULL, 0, B_FALSE) == 0);
-                               if (strcmp(nfsiscsi_mnt_prop, "off") != 0)
+                               if (strcmp(nfs_mnt_prop, "off") != 0)
                                        break;
                                verify(zfs_prop_get(zhp, ZFS_PROP_SHARESMB,
-                                   nfsiscsi_mnt_prop,
-                                   sizeof (nfsiscsi_mnt_prop),
+                                   nfs_mnt_prop,
+                                   sizeof (nfs_mnt_prop),
                                    NULL, NULL, 0, B_FALSE) == 0);
-                               if (strcmp(nfsiscsi_mnt_prop, "off") == 0)
+                               if (strcmp(nfs_mnt_prop, "off") == 0)
                                        continue;
                                break;
                        case OP_MOUNT:
                                /* Ignore legacy mounts */
                                verify(zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT,
-                                   nfsiscsi_mnt_prop,
-                                   sizeof (nfsiscsi_mnt_prop),
+                                   nfs_mnt_prop,
+                                   sizeof (nfs_mnt_prop),
                                    NULL, NULL, 0, B_FALSE) == 0);
-                               if (strcmp(nfsiscsi_mnt_prop, "legacy") == 0)
+                               if (strcmp(nfs_mnt_prop, "legacy") == 0)
                                        continue;
                                /* Ignore canmount=noauto mounts */
                                if (zfs_prop_get_int(zhp, ZFS_PROP_CANMOUNT) ==
@@ -3724,13 +6082,7 @@ unshare_unmount(int op, int argc, char **argv)
 
                        node = safe_malloc(sizeof (unshare_unmount_node_t));
                        node->un_zhp = zhp;
-
-                       if ((node->un_mountp = strdup(entry.mnt_mountp)) ==
-                           NULL) {
-                               (void) fprintf(stderr, gettext("internal error:"
-                                   " out of memory\n"));
-                               exit(1);
-                       }
+                       node->un_mountp = safe_strdup(entry.mnt_mountp);
 
                        uu_avl_node_init(node, &node->un_avlnode, pool);
 
@@ -3748,11 +6100,8 @@ unshare_unmount(int op, int argc, char **argv)
                 * removing it from the AVL tree in the process.
                 */
                if ((walk = uu_avl_walk_start(tree,
-                   UU_WALK_REVERSE | UU_WALK_ROBUST)) == NULL) {
-                       (void) fprintf(stderr,
-                           gettext("internal error: out of memory"));
-                       exit(1);
-               }
+                   UU_WALK_REVERSE | UU_WALK_ROBUST)) == NULL)
+                       nomem();
 
                while ((node = uu_avl_walk_next(walk)) != NULL) {
                        uu_avl_remove(tree, node);
@@ -3780,29 +6129,6 @@ unshare_unmount(int op, int argc, char **argv)
                uu_avl_destroy(tree);
                uu_avl_pool_destroy(pool);
 
-               if (op == OP_SHARE) {
-                       /*
-                        * Finally, unshare any volumes shared via iSCSI.
-                        */
-                       zfs_handle_t **dslist = NULL;
-                       size_t i, count = 0;
-
-                       get_all_datasets(ZFS_TYPE_VOLUME, &dslist, &count,
-                           B_FALSE);
-
-                       if (count != 0) {
-                               qsort(dslist, count, sizeof (void *),
-                                   dataset_cmp);
-
-                               for (i = 0; i < count; i++) {
-                                       if (zfs_unshare_iscsi(dslist[i]) != 0)
-                                               ret = 1;
-                                       zfs_close(dslist[i]);
-                               }
-
-                               free(dslist);
-                       }
-               }
        } else {
                if (argc != 1) {
                        if (argc == 0)
@@ -3824,91 +6150,63 @@ unshare_unmount(int op, int argc, char **argv)
                        return (unshare_unmount_path(op, argv[0],
                            flags, B_FALSE));
 
-               types = ZFS_TYPE_FILESYSTEM;
-               if (op == OP_SHARE)
-                       types |= ZFS_TYPE_VOLUME;
-
-               if ((zhp = zfs_open(g_zfs, argv[0], types)) == NULL)
+               if ((zhp = zfs_open(g_zfs, argv[0],
+                   ZFS_TYPE_FILESYSTEM)) == NULL)
                        return (1);
 
-               if (zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) {
-                       verify(zfs_prop_get(zhp, op == OP_SHARE ?
-                           ZFS_PROP_SHARENFS : ZFS_PROP_MOUNTPOINT,
-                           nfsiscsi_mnt_prop, sizeof (nfsiscsi_mnt_prop), NULL,
-                           NULL, 0, B_FALSE) == 0);
-
-                       switch (op) {
-                       case OP_SHARE:
-                               verify(zfs_prop_get(zhp, ZFS_PROP_SHARENFS,
-                                   nfsiscsi_mnt_prop,
-                                   sizeof (nfsiscsi_mnt_prop),
-                                   NULL, NULL, 0, B_FALSE) == 0);
-                               verify(zfs_prop_get(zhp, ZFS_PROP_SHARESMB,
-                                   sharesmb, sizeof (sharesmb), NULL, NULL,
-                                   0, B_FALSE) == 0);
-
-                               if (strcmp(nfsiscsi_mnt_prop, "off") == 0 &&
-                                   strcmp(sharesmb, "off") == 0) {
-                                       (void) fprintf(stderr, gettext("cannot "
-                                           "unshare '%s': legacy share\n"),
-                                           zfs_get_name(zhp));
-                                       (void) fprintf(stderr, gettext("use "
-                                           "unshare(1M) to unshare this "
-                                           "filesystem\n"));
-                                       ret = 1;
-                               } else if (!zfs_is_shared(zhp)) {
-                                       (void) fprintf(stderr, gettext("cannot "
-                                           "unshare '%s': not currently "
-                                           "shared\n"), zfs_get_name(zhp));
-                                       ret = 1;
-                               } else if (zfs_unshareall(zhp) != 0) {
-                                       ret = 1;
-                               }
-                               break;
-
-                       case OP_MOUNT:
-                               if (strcmp(nfsiscsi_mnt_prop, "legacy") == 0) {
-                                       (void) fprintf(stderr, gettext("cannot "
-                                           "unmount '%s': legacy "
-                                           "mountpoint\n"), zfs_get_name(zhp));
-                                       (void) fprintf(stderr, gettext("use "
-                                           "umount(1M) to unmount this "
-                                           "filesystem\n"));
-                                       ret = 1;
-                               } else if (!zfs_is_mounted(zhp, NULL)) {
-                                       (void) fprintf(stderr, gettext("cannot "
-                                           "unmount '%s': not currently "
-                                           "mounted\n"),
-                                           zfs_get_name(zhp));
-                                       ret = 1;
-                               } else if (zfs_unmountall(zhp, flags) != 0) {
-                                       ret = 1;
-                               }
-                               break;
-                       }
-               } else {
-                       assert(op == OP_SHARE);
+               verify(zfs_prop_get(zhp, op == OP_SHARE ?
+                   ZFS_PROP_SHARENFS : ZFS_PROP_MOUNTPOINT,
+                   nfs_mnt_prop, sizeof (nfs_mnt_prop), NULL,
+                   NULL, 0, B_FALSE) == 0);
 
-                       verify(zfs_prop_get(zhp, ZFS_PROP_SHAREISCSI,
-                           nfsiscsi_mnt_prop, sizeof (nfsiscsi_mnt_prop),
+               switch (op) {
+               case OP_SHARE:
+                       verify(zfs_prop_get(zhp, ZFS_PROP_SHARENFS,
+                           nfs_mnt_prop,
+                           sizeof (nfs_mnt_prop),
                            NULL, NULL, 0, B_FALSE) == 0);
+                       verify(zfs_prop_get(zhp, ZFS_PROP_SHARESMB,
+                           sharesmb, sizeof (sharesmb), NULL, NULL,
+                           0, B_FALSE) == 0);
 
-                       if (strcmp(nfsiscsi_mnt_prop, "off") == 0) {
-                               (void) fprintf(stderr, gettext("cannot unshare "
-                                   "'%s': 'shareiscsi' property not set\n"),
+                       if (strcmp(nfs_mnt_prop, "off") == 0 &&
+                           strcmp(sharesmb, "off") == 0) {
+                               (void) fprintf(stderr, gettext("cannot "
+                                   "unshare '%s': legacy share\n"),
                                    zfs_get_name(zhp));
-                               (void) fprintf(stderr, gettext("set "
-                                   "'shareiscsi' property or use "
-                                   "iscsitadm(1M) to share this volume\n"));
+                               (void) fprintf(stderr, gettext("use "
+                                   "unshare(1M) to unshare this "
+                                   "filesystem\n"));
+                               ret = 1;
+                       } else if (!zfs_is_shared(zhp)) {
+                               (void) fprintf(stderr, gettext("cannot "
+                                   "unshare '%s': not currently "
+                                   "shared\n"), zfs_get_name(zhp));
                                ret = 1;
-                       } else if (!zfs_is_shared_iscsi(zhp)) {
+                       } else if (zfs_unshareall(zhp) != 0) {
+                               ret = 1;
+                       }
+                       break;
+
+               case OP_MOUNT:
+                       if (strcmp(nfs_mnt_prop, "legacy") == 0) {
+                               (void) fprintf(stderr, gettext("cannot "
+                                   "unmount '%s': legacy "
+                                   "mountpoint\n"), zfs_get_name(zhp));
+                               (void) fprintf(stderr, gettext("use "
+                                   "umount(1M) to unmount this "
+                                   "filesystem\n"));
+                               ret = 1;
+                       } else if (!zfs_is_mounted(zhp, NULL)) {
                                (void) fprintf(stderr, gettext("cannot "
-                                   "unshare '%s': not currently shared\n"),
+                                   "unmount '%s': not currently "
+                                   "mounted\n"),
                                    zfs_get_name(zhp));
                                ret = 1;
-                       } else if (zfs_unshare_iscsi(zhp) != 0) {
+                       } else if (zfs_unmountall(zhp, flags) != 0) {
                                ret = 1;
                        }
+                       break;
                }
 
                zfs_close(zhp);
@@ -3941,185 +6239,103 @@ zfs_do_unshare(int argc, char **argv)
        return (unshare_unmount(OP_SHARE, argc, argv));
 }
 
-/*
- * Called when invoked as /etc/fs/zfs/mount.  Do the mount if the mountpoint is
- * 'legacy'.  Otherwise, complain that use should be using 'zfs mount'.
- */
 static int
-manual_mount(int argc, char **argv)
+find_command_idx(char *command, int *idx)
 {
-       zfs_handle_t *zhp;
-       char mountpoint[ZFS_MAXPROPLEN];
-       char mntopts[MNT_LINE_MAX] = { '\0' };
-       int ret;
-       int c;
-       int flags = 0;
-       char *dataset, *path;
-
-       /* check options */
-       while ((c = getopt(argc, argv, ":mo:O")) != -1) {
-               switch (c) {
-               case 'o':
-                       (void) strlcpy(mntopts, optarg, sizeof (mntopts));
-                       break;
-               case 'O':
-                       flags |= MS_OVERLAY;
-                       break;
-               case 'm':
-                       flags |= MS_NOMNTTAB;
-                       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);
-                       (void) fprintf(stderr, gettext("usage: mount [-o opts] "
-                           "<path>\n"));
-                       return (2);
-               }
-       }
-
-       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 (2);
-       }
-
-       dataset = argv[0];
-       path = argv[1];
-
-       /* try to open the dataset */
-       if ((zhp = zfs_open(g_zfs, dataset, ZFS_TYPE_FILESYSTEM)) == NULL)
-               return (1);
+       int i;
 
-       (void) zfs_prop_get(zhp, ZFS_PROP_MOUNTPOINT, mountpoint,
-           sizeof (mountpoint), NULL, NULL, 0, B_FALSE);
+       for (i = 0; i < NCOMMAND; i++) {
+               if (command_table[i].name == NULL)
+                       continue;
 
-       /* check for legacy mountpoint and complain appropriately */
-       ret = 0;
-       if (strcmp(mountpoint, ZFS_MOUNTPOINT_LEGACY) == 0) {
-               if (mount(dataset, path, MS_OPTIONSTR | flags, MNTTYPE_ZFS,
-                   NULL, 0, mntopts, sizeof (mntopts)) != 0) {
-                       (void) fprintf(stderr, gettext("mount failed: %s\n"),
-                           strerror(errno));
-                       ret = 1;
+               if (strcmp(command, command_table[i].name) == 0) {
+                       *idx = i;
+                       return (0);
                }
-       } else {
-               (void) fprintf(stderr, gettext("filesystem '%s' cannot be "
-                   "mounted using 'mount -F zfs'\n"), dataset);
-               (void) fprintf(stderr, gettext("Use 'zfs set mountpoint=%s' "
-                   "instead.\n"), path);
-               (void) fprintf(stderr, gettext("If you must use 'mount -F zfs' "
-                   "or /etc/vfstab, use 'zfs set mountpoint=legacy'.\n"));
-               (void) fprintf(stderr, gettext("See zfs(1M) for more "
-                   "information.\n"));
-               ret = 1;
        }
-
-       return (ret);
+       return (1);
 }
 
-/*
- * Called when invoked as /etc/fs/zfs/umount.  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)
+zfs_do_diff(int argc, char **argv)
 {
+       zfs_handle_t *zhp;
        int flags = 0;
+       char *tosnap = NULL;
+       char *fromsnap = NULL;
+       char *atp, *copy;
+       int err = 0;
        int c;
 
-       /* check options */
-       while ((c = getopt(argc, argv, "f")) != -1) {
+       while ((c = getopt(argc, argv, "FHt")) != -1) {
                switch (c) {
-               case 'f':
-                       flags = MS_FORCE;
+               case 'F':
+                       flags |= ZFS_DIFF_CLASSIFY;
                        break;
-               case '?':
-                       (void) fprintf(stderr, gettext("invalid option '%c'\n"),
-                           optopt);
-                       (void) fprintf(stderr, gettext("usage: unmount [-f] "
-                           "<path>\n"));
-                       return (2);
+               case 'H':
+                       flags |= ZFS_DIFF_PARSEABLE;
+                       break;
+               case 't':
+                       flags |= ZFS_DIFF_TIMESTAMP;
+                       break;
+               default:
+                       (void) fprintf(stderr,
+                           gettext("invalid option '%c'\n"), optopt);
+                       usage(B_FALSE);
                }
        }
 
        argc -= optind;
        argv += optind;
 
-       /* check arguments */
-       if (argc != 1) {
-               if (argc == 0)
-                       (void) fprintf(stderr, gettext("missing path "
-                           "argument\n"));
-               else
-                       (void) fprintf(stderr, gettext("too many arguments\n"));
-               (void) fprintf(stderr, gettext("usage: unmount [-f] <path>\n"));
-               return (2);
+       if (argc < 1) {
+               (void) fprintf(stderr,
+               gettext("must provide at least one snapshot name\n"));
+               usage(B_FALSE);
        }
 
-       return (unshare_unmount_path(OP_MOUNT, argv[0], flags, B_TRUE));
-}
+       if (argc > 2) {
+               (void) fprintf(stderr, gettext("too many arguments\n"));
+               usage(B_FALSE);
+       }
 
-static int
-volcheck(zpool_handle_t *zhp, void *data)
-{
-       boolean_t isinit = *((boolean_t *)data);
+       fromsnap = argv[0];
+       tosnap = (argc == 2) ? argv[1] : NULL;
 
-       if (isinit)
-               return (zpool_create_zvol_links(zhp));
-       else
-               return (zpool_remove_zvol_links(zhp));
-}
+       copy = NULL;
+       if (*fromsnap != '@')
+               copy = strdup(fromsnap);
+       else if (tosnap)
+               copy = strdup(tosnap);
+       if (copy == NULL)
+               usage(B_FALSE);
 
-/*
- * Iterate over all pools in the system and either create or destroy /dev/zvol
- * links, depending on the value of 'isinit'.
- */
-static int
-do_volcheck(boolean_t isinit)
-{
-       return (zpool_iter(g_zfs, volcheck, &isinit) ? 1 : 0);
-}
+       if ((atp = strchr(copy, '@')))
+               *atp = '\0';
 
-static int
-find_command_idx(char *command, int *idx)
-{
-       int i;
+       if ((zhp = zfs_open(g_zfs, copy, ZFS_TYPE_FILESYSTEM)) == NULL)
+               return (1);
 
-       for (i = 0; i < NCOMMAND; i++) {
-               if (command_table[i].name == NULL)
-                       continue;
+       free(copy);
 
-               if (strcmp(command, command_table[i].name) == 0) {
-                       *idx = i;
-                       return (0);
-               }
-       }
-       return (1);
+       /*
+        * Ignore SIGPIPE so that the library can give us
+        * information on any failure
+        */
+       (void) sigignore(SIGPIPE);
+
+       err = zfs_show_diffs(zhp, STDOUT_FILENO, fromsnap, tosnap, flags);
+
+       zfs_close(zhp);
+
+       return (err != 0);
 }
 
 int
 main(int argc, char **argv)
 {
-       int ret;
-       int i;
-       char *progname;
+       int ret = 0;
+       int i = 0;
        char *cmdname;
 
        (void) setlocale(LC_ALL, "");
@@ -4127,17 +6343,6 @@ main(int argc, char **argv)
 
        opterr = 0;
 
-       if ((g_zfs = libzfs_init()) == NULL) {
-               (void) fprintf(stderr, gettext("internal error: failed to "
-                   "initialize ZFS library\n"));
-               return (1);
-       }
-
-       zpool_set_history_str("zfs", argc, argv, history_str);
-       verify(zpool_stage_history(g_zfs, history_str) == 0);
-
-       libzfs_print_on_error(g_zfs, B_TRUE);
-
        if ((mnttab_file = fopen(MNTTAB, "r")) == NULL) {
                (void) fprintf(stderr, gettext("internal error: unable to "
                    "open %s\n"), MNTTAB);
@@ -4145,73 +6350,69 @@ main(int argc, char **argv)
        }
 
        /*
-        * This command also doubles as the /etc/fs mount and unmount program.
-        * Determine if we should take this behavior based on argv[0].
+        * Make sure the user has specified some command.
         */
-       progname = basename(argv[0]);
-       if (strcmp(progname, "mount") == 0) {
-               ret = manual_mount(argc, argv);
-       } else if (strcmp(progname, "umount") == 0) {
-               ret = manual_unmount(argc, argv);
-       } else {
-               /*
-                * Make sure the user has specified some command.
-                */
-               if (argc < 2) {
-                       (void) fprintf(stderr, gettext("missing command\n"));
-                       usage(B_FALSE);
-               }
+       if (argc < 2) {
+               (void) fprintf(stderr, gettext("missing command\n"));
+               usage(B_FALSE);
+       }
 
-               cmdname = argv[1];
+       cmdname = argv[1];
 
-               /*
-                * The 'umount' command is an alias for 'unmount'
-                */
-               if (strcmp(cmdname, "umount") == 0)
-                       cmdname = "unmount";
+       /*
+        * The 'umount' command is an alias for 'unmount'
+        */
+       if (strcmp(cmdname, "umount") == 0)
+               cmdname = "unmount";
 
-               /*
-                * The 'recv' command is an alias for 'receive'
-                */
-               if (strcmp(cmdname, "recv") == 0)
-                       cmdname = "receive";
+       /*
+        * The 'recv' command is an alias for 'receive'
+        */
+       if (strcmp(cmdname, "recv") == 0)
+               cmdname = "receive";
 
-               /*
-                * Special case '-?'
-                */
-               if (strcmp(cmdname, "-?") == 0)
-                       usage(B_TRUE);
+       /*
+        * The 'snap' command is an alias for 'snapshot'
+        */
+       if (strcmp(cmdname, "snap") == 0)
+               cmdname = "snapshot";
 
-               /*
-                * 'volinit' and 'volfini' do not appear in the usage message,
-                * so we have to special case them here.
-                */
-               if (strcmp(cmdname, "volinit") == 0)
-                       return (do_volcheck(B_TRUE));
-               else if (strcmp(cmdname, "volfini") == 0)
-                       return (do_volcheck(B_FALSE));
+       /*
+        * Special case '-?'
+        */
+       if ((strcmp(cmdname, "-?") == 0) ||
+           (strcmp(cmdname, "--help") == 0))
+               usage(B_TRUE);
 
-               /*
-                * Run the appropriate command.
-                */
-               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);
-               }
-       }
+       if ((g_zfs = libzfs_init()) == NULL)
+               return (1);
 
-       (void) fclose(mnttab_file);
+       zpool_set_history_str("zfs", argc, argv, history_str);
+       verify(zpool_stage_history(g_zfs, history_str) == 0);
+
+       libzfs_print_on_error(g_zfs, B_TRUE);
 
+       /*
+        * Run the appropriate command.
+        */
+       libzfs_mnttab_cache(g_zfs, B_FALSE);
+       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_fini(g_zfs);
 
+       (void) fclose(mnttab_file);
+
        /*
         * The 'ZFS_ABORT' environment variable causes us to dump core on exit
         * for the purposes of running ::findleaks.