]> git.proxmox.com Git - mirror_zfs.git/blobdiff - cmd/zfs/zfs_main.c
Add tunables for channel programs
[mirror_zfs.git] / cmd / zfs / zfs_main.c
index 8b6d9464ce89b1e18880c030897a5c5435e662be..e60ac514d2652897437bf5559824a8f9c88eb353 100644 (file)
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2018 by Delphix. All rights reserved.
  * Copyright 2012 Milan Jurik. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  * Copyright (c) 2013 Steven Hartland.  All rights reserved.
- * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2016 Igor Kozhukhov <ikozhukhov@gmail.com>.
+ * Copyright 2016 Nexenta Systems, Inc.
+ * Copyright (c) 2018 Datto Inc.
  */
 
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
+#include <getopt.h>
 #include <libgen.h>
 #include <libintl.h>
 #include <libuutil.h>
@@ -46,6 +49,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <signal.h>
+#include <sys/debug.h>
 #include <sys/list.h>
 #include <sys/mkdev.h>
 #include <sys/mntent.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/fs/zfs.h>
+#include <sys/systeminfo.h>
 #include <sys/types.h>
 #include <time.h>
+#include <sys/zfs_project.h>
 
 #include <libzfs.h>
 #include <libzfs_core.h>
@@ -70,6 +76,7 @@
 #include "zfs_util.h"
 #include "zfs_comutil.h"
 #include "libzfs_impl.h"
+#include "zfs_projectutil.h"
 
 libzfs_handle_t *g_zfs;
 
@@ -103,6 +110,12 @@ static int zfs_do_holds(int argc, char **argv);
 static int zfs_do_release(int argc, char **argv);
 static int zfs_do_diff(int argc, char **argv);
 static int zfs_do_bookmark(int argc, char **argv);
+static int zfs_do_channel_program(int argc, char **argv);
+static int zfs_do_remap(int argc, char **argv);
+static int zfs_do_load_key(int argc, char **argv);
+static int zfs_do_unload_key(int argc, char **argv);
+static int zfs_do_change_key(int argc, char **argv);
+static int zfs_do_project(int argc, char **argv);
 
 /*
  * Enable a reasonable set of defaults for libumem debugging on DEBUG builds.
@@ -145,11 +158,18 @@ typedef enum {
        HELP_UNALLOW,
        HELP_USERSPACE,
        HELP_GROUPSPACE,
+       HELP_PROJECTSPACE,
+       HELP_PROJECT,
        HELP_HOLD,
        HELP_HOLDS,
        HELP_RELEASE,
        HELP_DIFF,
+       HELP_REMAP,
        HELP_BOOKMARK,
+       HELP_CHANNEL_PROGRAM,
+       HELP_LOAD_KEY,
+       HELP_UNLOAD_KEY,
+       HELP_CHANGE_KEY,
 } zfs_help_t;
 
 typedef struct zfs_command {
@@ -177,6 +197,7 @@ static zfs_command_t command_table[] = {
        { "promote",    zfs_do_promote,         HELP_PROMOTE            },
        { "rename",     zfs_do_rename,          HELP_RENAME             },
        { "bookmark",   zfs_do_bookmark,        HELP_BOOKMARK           },
+       { "program",    zfs_do_channel_program, HELP_CHANNEL_PROGRAM    },
        { NULL },
        { "list",       zfs_do_list,            HELP_LIST               },
        { NULL },
@@ -184,8 +205,12 @@ static zfs_command_t command_table[] = {
        { "get",        zfs_do_get,             HELP_GET                },
        { "inherit",    zfs_do_inherit,         HELP_INHERIT            },
        { "upgrade",    zfs_do_upgrade,         HELP_UPGRADE            },
+       { NULL },
        { "userspace",  zfs_do_userspace,       HELP_USERSPACE          },
        { "groupspace", zfs_do_userspace,       HELP_GROUPSPACE         },
+       { "projectspace", zfs_do_userspace,     HELP_PROJECTSPACE       },
+       { NULL },
+       { "project",    zfs_do_project,         HELP_PROJECT            },
        { NULL },
        { "mount",      zfs_do_mount,           HELP_MOUNT              },
        { "unmount",    zfs_do_unmount,         HELP_UNMOUNT            },
@@ -203,6 +228,10 @@ static zfs_command_t command_table[] = {
        { "holds",      zfs_do_holds,           HELP_HOLDS              },
        { "release",    zfs_do_release,         HELP_RELEASE            },
        { "diff",       zfs_do_diff,            HELP_DIFF               },
+       { "remap",      zfs_do_remap,           HELP_REMAP              },
+       { "load-key",   zfs_do_load_key,        HELP_LOAD_KEY           },
+       { "unload-key", zfs_do_unload_key,      HELP_UNLOAD_KEY         },
+       { "change-key", zfs_do_change_key,      HELP_CHANGE_KEY         },
 };
 
 #define        NCOMMAND        (sizeof (command_table) / sizeof (command_table[0]))
@@ -231,7 +260,7 @@ get_usage(zfs_help_t idx)
                    "[-o \"all\" | field[,...]]\n"
                    "\t    [-t type[,...]] [-s source[,...]]\n"
                    "\t    <\"all\" | property[,...]> "
-                   "[filesystem|volume|snapshot] ...\n"));
+                   "[filesystem|volume|snapshot|bookmark] ...\n"));
        case HELP_INHERIT:
                return (gettext("\tinherit [-rS] <property> "
                    "<filesystem|volume|snapshot> ...\n"));
@@ -244,14 +273,16 @@ get_usage(zfs_help_t idx)
                    "[filesystem|volume|snapshot] ...\n"));
        case HELP_MOUNT:
                return (gettext("\tmount\n"
-                   "\tmount [-vO] [-o opts] <-a | filesystem>\n"));
+                   "\tmount [-lvO] [-o opts] <-a | filesystem>\n"));
        case HELP_PROMOTE:
                return (gettext("\tpromote <clone-filesystem>\n"));
        case HELP_RECEIVE:
-               return (gettext("\treceive [-vnsFu] <filesystem|volume|"
-                   "snapshot>\n"
-                   "\treceive [-vnsFu] [-o origin=<snapshot>] [-d | -e] "
-                   "<filesystem>\n"
+               return (gettext("\treceive [-vnsFu] "
+                   "[-o <property>=<value>] ... [-x <property>] ...\n"
+                   "\t    <filesystem|volume|snapshot>\n"
+                   "\treceive [-vnsFu] [-o <property>=<value>] ... "
+                   "[-x <property>] ... \n"
+                   "\t    [-d | -e] <filesystem>\n"
                    "\treceive -A <filesystem|volume>\n"));
        case HELP_RENAME:
                return (gettext("\trename [-f] <filesystem|volume|snapshot> "
@@ -261,25 +292,25 @@ get_usage(zfs_help_t idx)
        case HELP_ROLLBACK:
                return (gettext("\trollback [-rRf] <snapshot>\n"));
        case HELP_SEND:
-               return (gettext("\tsend [-DnPpRvLec] [-[iI] snapshot] "
+               return (gettext("\tsend [-DnPpRvLecwb] [-[i|I] snapshot] "
                    "<snapshot>\n"
-                   "\tsend [-Le] [-i snapshot|bookmark] "
+                   "\tsend [-nvPLecw] [-i snapshot|bookmark] "
                    "<filesystem|volume|snapshot>\n"
                    "\tsend [-nvPe] -t <receive_resume_token>\n"));
        case HELP_SET:
                return (gettext("\tset <property=value> ... "
                    "<filesystem|volume|snapshot> ...\n"));
        case HELP_SHARE:
-               return (gettext("\tshare <-a | filesystem>\n"));
+               return (gettext("\tshare [-l] <-a [nfs|smb] | filesystem>\n"));
        case HELP_SNAPSHOT:
-               return (gettext("\tsnapshot|snap [-r] [-o property=value] ... "
+               return (gettext("\tsnapshot [-r] [-o property=value] ... "
                    "<filesystem|volume>@<snap> ...\n"));
        case HELP_UNMOUNT:
                return (gettext("\tunmount [-f] "
                    "<-a | filesystem|mountpoint>\n"));
        case HELP_UNSHARE:
                return (gettext("\tunshare "
-                   "<-a | filesystem|mountpoint>\n"));
+                   "<-a [nfs|smb] | filesystem|mountpoint>\n"));
        case HELP_ALLOW:
                return (gettext("\tallow <filesystem|volume>\n"
                    "\tallow [-ldug] "
@@ -310,6 +341,15 @@ get_usage(zfs_help_t idx)
                    "[-s field] ...\n"
                    "\t    [-S field] ... [-t type[,...]] "
                    "<filesystem|snapshot>\n"));
+       case HELP_PROJECTSPACE:
+               return (gettext("\tprojectspace [-Hp] [-o field[,...]] "
+                   "[-s field] ... \n"
+                   "\t    [-S field] ... <filesystem|snapshot>\n"));
+       case HELP_PROJECT:
+               return (gettext("\tproject [-d|-r] <directory|file ...>\n"
+                   "\tproject -c [-0] [-d|-r] [-p id] <directory|file ...>\n"
+                   "\tproject -C [-k] [-r] <directory ...>\n"
+                   "\tproject [-p id] [-r] [-s] <directory ...>\n"));
        case HELP_HOLD:
                return (gettext("\thold [-r] <tag> <snapshot> ...\n"));
        case HELP_HOLDS:
@@ -319,8 +359,25 @@ get_usage(zfs_help_t idx)
        case HELP_DIFF:
                return (gettext("\tdiff [-FHt] <snapshot> "
                    "[snapshot|filesystem]\n"));
+       case HELP_REMAP:
+               return (gettext("\tremap <filesystem | volume>\n"));
        case HELP_BOOKMARK:
                return (gettext("\tbookmark <snapshot> <bookmark>\n"));
+       case HELP_CHANNEL_PROGRAM:
+               return (gettext("\tprogram [-jn] [-t <instruction limit>] "
+                   "[-m <memory limit (b)>] <pool> <program file> "
+                   "[lua args...]\n"));
+       case HELP_LOAD_KEY:
+               return (gettext("\tload-key [-rn] [-L <keylocation>] "
+                   "<-a | filesystem|volume>\n"));
+       case HELP_UNLOAD_KEY:
+               return (gettext("\tunload-key [-r] "
+                   "<-a | filesystem|volume>\n"));
+       case HELP_CHANGE_KEY:
+               return (gettext("\tchange-key [-l] [-o keyformat=<value>]\n"
+                   "\t    [-o keylocation=<value>] [-o pbkfd2iters=<value>]\n"
+                   "\t    <filesystem|volume>\n"
+                   "\tchange-key -i [-l] <filesystem|volume>\n"));
        }
 
        abort();
@@ -349,6 +406,18 @@ safe_malloc(size_t size)
        return (data);
 }
 
+void *
+safe_realloc(void *data, size_t size)
+{
+       void *newp;
+       if ((newp = realloc(data, size)) == NULL) {
+               free(data);
+               nomem();
+       }
+
+       return (newp);
+}
+
 static char *
 safe_strdup(char *str)
 {
@@ -444,10 +513,26 @@ usage(boolean_t requested)
                (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 ", "projectused@...");
+               (void) fprintf(fp, " NO       NO   <size>\n");
+               (void) fprintf(fp, "\t%-15s ", "userobjused@...");
+               (void) fprintf(fp, " NO       NO   <size>\n");
+               (void) fprintf(fp, "\t%-15s ", "groupobjused@...");
+               (void) fprintf(fp, " NO       NO   <size>\n");
+               (void) fprintf(fp, "\t%-15s ", "projectobjused@...");
+               (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 ", "projectquota@...");
+               (void) fprintf(fp, "YES       NO   <size> | none\n");
+               (void) fprintf(fp, "\t%-15s ", "userobjquota@...");
+               (void) fprintf(fp, "YES       NO   <size> | none\n");
+               (void) fprintf(fp, "\t%-15s ", "groupobjquota@...");
+               (void) fprintf(fp, "YES       NO   <size> | none\n");
+               (void) fprintf(fp, "\t%-15s ", "projectobjquota@...");
+               (void) fprintf(fp, "YES       NO   <size> | none\n");
                (void) fprintf(fp, "\t%-15s ", "written@<snap>");
                (void) fprintf(fp, " NO       NO   <size>\n");
 
@@ -455,9 +540,9 @@ usage(boolean_t requested)
                    "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"));
-               (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"
+               (void) fprintf(fp, gettext("\nThe {user|group|project}"
+                   "[obj]{used|quota}@ properties must be appended with\n"
+                   "a user|group|project specifier of one of these forms:\n"
                    "    POSIX name      (eg: \"matt\")\n"
                    "    POSIX id        (eg: \"126829\")\n"
                    "    SMB name@domain (eg: \"matt@sun\")\n"
@@ -486,26 +571,48 @@ usage(boolean_t requested)
  * Take a property=value argument string and add it to the given nvlist.
  * Modifies the argument inplace.
  */
-static int
+static boolean_t
 parseprop(nvlist_t *props, char *propname)
 {
-       char *propval, *strval;
+       char *propval;
 
        if ((propval = strchr(propname, '=')) == NULL) {
                (void) fprintf(stderr, gettext("missing "
                    "'=' for property=value argument\n"));
-               return (-1);
+               return (B_FALSE);
        }
        *propval = '\0';
        propval++;
-       if (nvlist_lookup_string(props, propname, &strval) == 0) {
+       if (nvlist_exists(props, propname)) {
                (void) fprintf(stderr, gettext("property '%s' "
                    "specified multiple times\n"), propname);
-               return (-1);
+               return (B_FALSE);
        }
        if (nvlist_add_string(props, propname, propval) != 0)
                nomem();
-       return (0);
+       return (B_TRUE);
+}
+
+/*
+ * Take a property name argument and add it to the given nvlist.
+ * Modifies the argument inplace.
+ */
+static boolean_t
+parsepropname(nvlist_t *props, char *propname)
+{
+       if (strchr(propname, '=') != NULL) {
+               (void) fprintf(stderr, gettext("invalid character "
+                   "'=' in property argument\n"));
+               return (B_FALSE);
+       }
+       if (nvlist_exists(props, propname)) {
+               (void) fprintf(stderr, gettext("property '%s' "
+                   "specified multiple times\n"), propname);
+               return (B_FALSE);
+       }
+       if (nvlist_add_boolean(props, propname) != 0)
+               nomem();
+       return (B_TRUE);
 }
 
 static int
@@ -659,7 +766,7 @@ zfs_do_clone(int argc, char **argv)
        while ((c = getopt(argc, argv, "o:p")) != -1) {
                switch (c) {
                case 'o':
-                       if (parseprop(props, optarg) != 0) {
+                       if (!parseprop(props, optarg)) {
                                nvlist_free(props);
                                return (1);
                        }
@@ -738,8 +845,7 @@ zfs_do_clone(int argc, char **argv)
        return (!!ret);
 
 usage:
-       if (zhp)
-               zfs_close(zhp);
+       ASSERT3P(zhp, ==, NULL);
        nvlist_free(props);
        usage(B_FALSE);
        return (-1);
@@ -811,7 +917,7 @@ zfs_do_create(int argc, char **argv)
                                nomem();
                        break;
                case 'o':
-                       if (parseprop(props, optarg) != 0)
+                       if (!parseprop(props, optarg))
                                goto error;
                        break;
                case 's':
@@ -857,7 +963,7 @@ zfs_do_create(int argc, char **argv)
                char *strval;
                char msg[1024];
 
-               if ((p = strchr(argv[0], '/')))
+               if ((p = strchr(argv[0], '/')) != NULL)
                        *p = '\0';
                zpool_handle = zpool_open(g_zfs, argv[0]);
                if (p != NULL)
@@ -874,7 +980,7 @@ zfs_do_create(int argc, char **argv)
                (void) snprintf(msg, sizeof (msg),
                    gettext("cannot create '%s'"), argv[0]);
                if (props && (real_props = zfs_valid_proplist(g_zfs, type,
-                   props, 0, NULL, zpool_handle, msg)) == NULL) {
+                   props, 0, NULL, zpool_handle, B_TRUE, msg)) == NULL) {
                        zpool_close(zpool_handle);
                        goto error;
                }
@@ -960,6 +1066,7 @@ typedef struct destroy_cbdata {
        int64_t         cb_snapused;
        char            *cb_snapspec;
        char            *cb_bookmark;
+       uint64_t        cb_snap_count;
 } destroy_cbdata_t;
 
 /*
@@ -1022,11 +1129,22 @@ out:
        return (0);
 }
 
+static int
+destroy_batched(destroy_cbdata_t *cb)
+{
+       int error = zfs_destroy_snaps_nvl(g_zfs,
+           cb->cb_batchedsnaps, B_FALSE);
+       fnvlist_free(cb->cb_batchedsnaps);
+       cb->cb_batchedsnaps = fnvlist_alloc();
+       return (error);
+}
+
 static int
 destroy_callback(zfs_handle_t *zhp, void *data)
 {
        destroy_cbdata_t *cb = data;
        const char *name = zfs_get_name(zhp);
+       int error;
 
        if (cb->cb_verbose) {
                if (cb->cb_parsable) {
@@ -1061,17 +1179,25 @@ destroy_callback(zfs_handle_t *zhp, void *data)
         * because we must delete a clone before its origin.
         */
        if (zfs_get_type(zhp) == ZFS_TYPE_SNAPSHOT) {
+               cb->cb_snap_count++;
                fnvlist_add_boolean(cb->cb_batchedsnaps, name);
+               if (cb->cb_snap_count % 10 == 0 && cb->cb_defer_destroy)
+                       error = destroy_batched(cb);
        } else {
-               int error = zfs_destroy_snaps_nvl(g_zfs,
-                   cb->cb_batchedsnaps, B_FALSE);
-               fnvlist_free(cb->cb_batchedsnaps);
-               cb->cb_batchedsnaps = fnvlist_alloc();
-
+               error = destroy_batched(cb);
                if (error != 0 ||
                    zfs_unmount(zhp, NULL, cb->cb_force ? MS_FORCE : 0) != 0 ||
                    zfs_destroy(zhp, cb->cb_defer_destroy) != 0) {
                        zfs_close(zhp);
+                       /*
+                        * When performing a recursive destroy we ignore errors
+                        * so that the recursive destroy could continue
+                        * destroying past problem datasets
+                        */
+                       if (cb->cb_recurse) {
+                               cb->cb_error = B_TRUE;
+                               return (0);
+                       }
                        return (-1);
                }
        }
@@ -1311,7 +1437,7 @@ zfs_do_destroy(int argc, char **argv)
 
                if (cb.cb_verbose) {
                        char buf[16];
-                       zfs_nicenum(cb.cb_snapused, buf, sizeof (buf));
+                       zfs_nicebytes(cb.cb_snapused, buf, sizeof (buf));
                        if (cb.cb_parsable) {
                                (void) printf("reclaim\t%llu\n",
                                    (u_longlong_t)cb.cb_snapused);
@@ -1424,7 +1550,6 @@ zfs_do_destroy(int argc, char **argv)
                        rv = 1;
                        goto out;
                }
-
                cb.cb_batchedsnaps = fnvlist_alloc();
                if (zfs_iter_dependents(zhp, B_FALSE, destroy_callback,
                    &cb) != 0) {
@@ -1442,7 +1567,7 @@ zfs_do_destroy(int argc, char **argv)
                        err = zfs_destroy_snaps_nvl(g_zfs,
                            cb.cb_batchedsnaps, cb.cb_defer_destroy);
                }
-               if (err != 0)
+               if (err != 0 || cb.cb_error == B_TRUE)
                        rv = 1;
        }
 
@@ -1607,7 +1732,7 @@ zfs_do_get(int argc, char **argv)
 {
        zprop_get_cbdata_t cb = { 0 };
        int i, c, flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
-       int types = ZFS_TYPE_DATASET;
+       int types = ZFS_TYPE_DATASET | ZFS_TYPE_BOOKMARK;
        char *value, *fields;
        int ret = 0;
        int limit = 0;
@@ -2174,7 +2299,7 @@ zfs_do_upgrade(int argc, char **argv)
                if (cb.cb_numfailed != 0)
                        ret = 1;
        } else {
-               /* List old-version filesytems */
+               /* List old-version filesystems */
                boolean_t found;
                (void) printf(gettext("This system is currently running "
                    "ZFS filesystem version %llu.\n\n"), ZPL_VERSION);
@@ -2204,6 +2329,8 @@ zfs_do_upgrade(int argc, char **argv)
  *               [-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
+ * zfs projectspace [-Hp] [-o field[,...]] [-s field [-s field]...]
+ *                [-S field [-S field]...] filesystem | snapshot
  *
  *     -H      Scripted mode; elide headers and separate columns by tabs.
  *     -i      Translate SID to POSIX ID.
@@ -2237,8 +2364,10 @@ static char *us_field_names[] = { "type", "name", "used", "quota",
 #define        USTYPE_PSX_USR  (1 << 1)
 #define        USTYPE_SMB_GRP  (1 << 2)
 #define        USTYPE_SMB_USR  (1 << 3)
+#define        USTYPE_PROJ     (1 << 4)
 #define        USTYPE_ALL      \
-       (USTYPE_PSX_GRP | USTYPE_PSX_USR | USTYPE_SMB_GRP | USTYPE_SMB_USR)
+       (USTYPE_PSX_GRP | USTYPE_PSX_USR | USTYPE_SMB_GRP | USTYPE_SMB_USR | \
+           USTYPE_PROJ)
 
 static int us_type_bits[] = {
        USTYPE_PSX_GRP,
@@ -2332,9 +2461,9 @@ compare_nums:
                                        rc = (rv64 < lv64) ? 1 : -1;
                        } else {
                                if ((nvlist_lookup_string(lnvl, propname,
-                                               &lvstr) == ENOENT) ||
+                                   &lvstr) == ENOENT) ||
                                    (nvlist_lookup_string(rnvl, propname,
-                                               &rvstr) == ENOENT)) {
+                                   &rvstr) == ENOENT)) {
                                        goto compare_nums;
                                }
                                rc = strcmp(lvstr, rvstr);
@@ -2353,6 +2482,7 @@ compare_nums:
                        if (rv64 != lv64)
                                rc = (rv64 < lv64) ? 1 : -1;
                        break;
+
                default:
                        break;
                }
@@ -2392,6 +2522,13 @@ zfs_prop_is_group(unsigned p)
            p == ZFS_PROP_GROUPOBJUSED || p == ZFS_PROP_GROUPOBJQUOTA);
 }
 
+static boolean_t
+zfs_prop_is_project(unsigned p)
+{
+       return (p == ZFS_PROP_PROJECTUSED || p == ZFS_PROP_PROJECTQUOTA ||
+           p == ZFS_PROP_PROJECTOBJUSED || p == ZFS_PROP_PROJECTOBJQUOTA);
+}
+
 static inline const char *
 us_type2str(unsigned field_type)
 {
@@ -2404,6 +2541,8 @@ us_type2str(unsigned field_type)
                return ("SMB User");
        case USTYPE_SMB_GRP:
                return ("SMB Group");
+       case USTYPE_PROJ:
+               return ("Project");
        default:
                return ("Undefined");
        }
@@ -2489,7 +2628,7 @@ userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space)
                                if ((g = getgrgid(rid)) != NULL)
                                        name = g->gr_name;
                        }
-               } else {
+               } else if (zfs_prop_is_user(prop)) {
                        type = USTYPE_PSX_USR;
                        if (!cb->cb_numname) {
                                struct passwd *p;
@@ -2497,6 +2636,8 @@ userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space)
                                if ((p = getpwuid(rid)) != NULL)
                                        name = p->pw_name;
                        }
+               } else {
+                       type = USTYPE_PROJ;
                }
        }
 
@@ -2529,7 +2670,7 @@ userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space)
                namelen = strlen(name);
        }
        nameidx = us_field_index("name");
-       if (namelen > cb->cb_width[nameidx])
+       if (nameidx >= 0 && namelen > cb->cb_width[nameidx])
                cb->cb_width[nameidx] = namelen;
 
        /*
@@ -2546,27 +2687,38 @@ userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space)
        }
 
        /* Calculate/update width of USED/QUOTA fields */
-       if (cb->cb_nicenum)
-               zfs_nicenum(space, sizebuf, sizeof (sizebuf));
-       else
+       if (cb->cb_nicenum) {
+               if (prop == ZFS_PROP_USERUSED || prop == ZFS_PROP_GROUPUSED ||
+                   prop == ZFS_PROP_USERQUOTA || prop == ZFS_PROP_GROUPQUOTA ||
+                   prop == ZFS_PROP_PROJECTUSED ||
+                   prop == ZFS_PROP_PROJECTQUOTA) {
+                       zfs_nicebytes(space, sizebuf, sizeof (sizebuf));
+               } else {
+                       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) {
+       if (prop == ZFS_PROP_USERUSED || prop == ZFS_PROP_GROUPUSED ||
+           prop == ZFS_PROP_PROJECTUSED) {
                propname = "used";
                if (!nvlist_exists(props, "quota"))
                        (void) nvlist_add_uint64(props, "quota", 0);
-       } else if (prop == ZFS_PROP_USERQUOTA || prop == ZFS_PROP_GROUPQUOTA) {
+       } else if (prop == ZFS_PROP_USERQUOTA || prop == ZFS_PROP_GROUPQUOTA ||
+           prop == ZFS_PROP_PROJECTQUOTA) {
                propname = "quota";
                if (!nvlist_exists(props, "used"))
                        (void) nvlist_add_uint64(props, "used", 0);
        } else if (prop == ZFS_PROP_USEROBJUSED ||
-                   prop == ZFS_PROP_GROUPOBJUSED) {
+           prop == ZFS_PROP_GROUPOBJUSED || prop == ZFS_PROP_PROJECTOBJUSED) {
                propname = "objused";
                if (!nvlist_exists(props, "objquota"))
                        (void) nvlist_add_uint64(props, "objquota", 0);
        } else if (prop == ZFS_PROP_USEROBJQUOTA ||
-                   prop == ZFS_PROP_GROUPOBJQUOTA) {
+           prop == ZFS_PROP_GROUPOBJQUOTA ||
+           prop == ZFS_PROP_PROJECTOBJQUOTA) {
                propname = "objquota";
                if (!nvlist_exists(props, "objused"))
                        (void) nvlist_add_uint64(props, "objused", 0);
@@ -2574,7 +2726,7 @@ userspace_cb(void *arg, const char *domain, uid_t rid, uint64_t space)
                return (-1);
        }
        sizeidx = us_field_index(propname);
-       if (sizelen > cb->cb_width[sizeidx])
+       if (sizeidx >= 0 && sizelen > cb->cb_width[sizeidx])
                cb->cb_width[sizeidx] = sizelen;
 
        if (nvlist_add_uint64(props, propname, space) != 0)
@@ -2637,28 +2789,42 @@ print_us_node(boolean_t scripted, boolean_t parsable, int *fields, int types,
                case USFIELD_NAME:
                        if (type == DATA_TYPE_UINT64) {
                                (void) sprintf(valstr, "%llu",
-                                   (u_longlong_t) val64);
+                                   (u_longlong_t)val64);
                                strval = valstr;
                        }
                        break;
                case USFIELD_USED:
                case USFIELD_QUOTA:
+                       if (type == DATA_TYPE_UINT64) {
+                               if (parsable) {
+                                       (void) sprintf(valstr, "%llu",
+                                           (u_longlong_t)val64);
+                                       strval = valstr;
+                               } else if (field == USFIELD_QUOTA &&
+                                   val64 == 0) {
+                                       strval = "none";
+                               } else {
+                                       zfs_nicebytes(val64, valstr,
+                                           sizeof (valstr));
+                                       strval = valstr;
+                               }
+                       }
+                       break;
                case USFIELD_OBJUSED:
                case USFIELD_OBJQUOTA:
                        if (type == DATA_TYPE_UINT64) {
                                if (parsable) {
                                        (void) sprintf(valstr, "%llu",
-                                           (u_longlong_t) val64);
+                                           (u_longlong_t)val64);
+                                       strval = valstr;
+                               } else if (field == USFIELD_OBJQUOTA &&
+                                   val64 == 0) {
+                                       strval = "none";
                                } else {
                                        zfs_nicenum(val64, valstr,
                                            sizeof (valstr));
-                               }
-                               if ((field == USFIELD_QUOTA ||
-                                   field == USFIELD_OBJQUOTA) &&
-                                   strcmp(valstr, "0") == 0)
-                                       strval = "none";
-                               else
                                        strval = valstr;
+                               }
                        }
                        break;
                }
@@ -2672,9 +2838,9 @@ print_us_node(boolean_t scripted, boolean_t parsable, int *fields, int types,
                if (scripted)
                        (void) printf("%s", strval);
                else if (field == USFIELD_TYPE || field == USFIELD_NAME)
-                       (void) printf("%-*s", (int) width[field], strval);
+                       (void) printf("%-*s", (int)width[field], strval);
                else
-                       (void) printf("%*s", (int) width[field], strval);
+                       (void) printf("%*s", (int)width[field], strval);
 
                first = B_FALSE;
                cfield++;
@@ -2699,10 +2865,10 @@ print_us(boolean_t scripted, boolean_t parsable, int *fields, int types,
                        col = gettext(us_field_hdr[field]);
                        if (field == USFIELD_TYPE || field == USFIELD_NAME) {
                                (void) printf(first ? "%-*s" : "  %-*s",
-                                   (int) width[field], col);
+                                   (int)width[field], col);
                        } else {
                                (void) printf(first ? "%*s" : "  %*s",
-                                   (int) width[field], col);
+                                   (int)width[field], col);
                        }
                        first = B_FALSE;
                        cfield++;
@@ -2751,13 +2917,22 @@ zfs_do_userspace(int argc, char **argv)
        if (argc < 2)
                usage(B_FALSE);
 
-       if (strcmp(argv[0], "groupspace") == 0)
+       if (strcmp(argv[0], "groupspace") == 0) {
                /* Toggle default group types */
                types = USTYPE_PSX_GRP | USTYPE_SMB_GRP;
+       } else if (strcmp(argv[0], "projectspace") == 0) {
+               types = USTYPE_PROJ;
+               prtnum = B_TRUE;
+       }
 
        while ((c = getopt(argc, argv, "nHpo:s:S:t:i")) != -1) {
                switch (c) {
                case 'n':
+                       if (types == USTYPE_PROJ) {
+                               (void) fprintf(stderr,
+                                   gettext("invalid option 'n'\n"));
+                               usage(B_FALSE);
+                       }
                        prtnum = B_TRUE;
                        break;
                case 'H':
@@ -2779,9 +2954,19 @@ zfs_do_userspace(int argc, char **argv)
                        }
                        break;
                case 't':
+                       if (types == USTYPE_PROJ) {
+                               (void) fprintf(stderr,
+                                   gettext("invalid option 't'\n"));
+                               usage(B_FALSE);
+                       }
                        tfield = optarg;
                        break;
                case 'i':
+                       if (types == USTYPE_PROJ) {
+                               (void) fprintf(stderr,
+                                   gettext("invalid option 'i'\n"));
+                               usage(B_FALSE);
+                       }
                        sid2posix = B_TRUE;
                        break;
                case ':':
@@ -2878,7 +3063,8 @@ zfs_do_userspace(int argc, char **argv)
                if ((zfs_prop_is_user(p) &&
                    !(types & (USTYPE_PSX_USR | USTYPE_SMB_USR))) ||
                    (zfs_prop_is_group(p) &&
-                   !(types & (USTYPE_PSX_GRP | USTYPE_SMB_GRP))))
+                   !(types & (USTYPE_PSX_GRP | USTYPE_SMB_GRP))) ||
+                   (zfs_prop_is_project(p) && types != USTYPE_PROJ))
                        continue;
 
                cb.cb_prop = p;
@@ -3376,7 +3562,7 @@ zfs_do_promote(int argc, char **argv)
  *
  *     -r      Delete any intervening snapshots before doing rollback
  *     -R      Delete any snapshots and their clones
- *     -f      ignored for backwards compatability
+ *     -f      ignored for backwards compatibility
  *
  * Given a filesystem, rollback to a specific snapshot, discarding any changes
  * since then and making it the active dataset.  If more recent snapshots exist,
@@ -3626,8 +3812,10 @@ zfs_do_set(int argc, char **argv)
        if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
                nomem();
        for (i = 1; i < ds_start; i++) {
-               if ((ret = parseprop(props, argv[i])) != 0)
+               if (!parseprop(props, argv[i])) {
+                       ret = -1;
                        goto error;
+               }
        }
 
        ret = zfs_for_each(argc - ds_start, argv + ds_start, 0,
@@ -3694,7 +3882,7 @@ zfs_do_snapshot(int argc, char **argv)
        while ((c = getopt(argc, argv, "ro:")) != -1) {
                switch (c) {
                case 'o':
-                       if (parseprop(props, optarg) != 0) {
+                       if (!parseprop(props, optarg)) {
                                nvlist_free(sd.sd_nvl);
                                nvlist_free(props);
                                return (1);
@@ -3769,8 +3957,25 @@ zfs_do_send(int argc, char **argv)
        nvlist_t *dbgnv = NULL;
        boolean_t extraverbose = B_FALSE;
 
+       struct option long_options[] = {
+               {"replicate",   no_argument,            NULL, 'R'},
+               {"props",       no_argument,            NULL, 'p'},
+               {"parsable",    no_argument,            NULL, 'P'},
+               {"dedup",       no_argument,            NULL, 'D'},
+               {"verbose",     no_argument,            NULL, 'v'},
+               {"dryrun",      no_argument,            NULL, 'n'},
+               {"large-block", no_argument,            NULL, 'L'},
+               {"embed",       no_argument,            NULL, 'e'},
+               {"resume",      required_argument,      NULL, 't'},
+               {"compressed",  no_argument,            NULL, 'c'},
+               {"raw",         no_argument,            NULL, 'w'},
+               {"backup",      no_argument,            NULL, 'b'},
+               {0, 0, 0, 0}
+       };
+
        /* check options */
-       while ((c = getopt(argc, argv, ":i:I:RDpvnPLet:c")) != -1) {
+       while ((c = getopt_long(argc, argv, ":i:I:RDpvnPLet:cwb", long_options,
+           NULL)) != -1) {
                switch (c) {
                case 'i':
                        if (fromname)
@@ -3789,6 +3994,9 @@ zfs_do_send(int argc, char **argv)
                case 'p':
                        flags.props = B_TRUE;
                        break;
+               case 'b':
+                       flags.backup = B_TRUE;
+                       break;
                case 'P':
                        flags.parsable = B_TRUE;
                        flags.verbose = B_TRUE;
@@ -3817,14 +4025,49 @@ zfs_do_send(int argc, char **argv)
                case 'c':
                        flags.compress = B_TRUE;
                        break;
+               case 'w':
+                       flags.raw = B_TRUE;
+                       flags.compress = B_TRUE;
+                       flags.embed_data = B_TRUE;
+                       flags.largeblock = B_TRUE;
+                       break;
                case ':':
-                       (void) fprintf(stderr, gettext("missing argument for "
-                           "'%c' option\n"), optopt);
+                       /*
+                        * If a parameter was not passed, optopt contains the
+                        * value that would normally lead us into the
+                        * appropriate case statement.  If it's > 256, then this
+                        * must be a longopt and we should look at argv to get
+                        * the string.  Otherwise it's just the character, so we
+                        * should use it directly.
+                        */
+                       if (optopt <= UINT8_MAX) {
+                               (void) fprintf(stderr,
+                                   gettext("missing argument for '%c' "
+                                   "option\n"), optopt);
+                       } else {
+                               (void) fprintf(stderr,
+                                   gettext("missing argument for '%s' "
+                                   "option\n"), argv[optind - 1]);
+                       }
                        usage(B_FALSE);
                        break;
                case '?':
-                       (void) fprintf(stderr, gettext("invalid option '%c'\n"),
-                           optopt);
+                       /*FALLTHROUGH*/
+               default:
+                       /*
+                        * If an invalid flag was passed, optopt contains the
+                        * character if it was a short flag, or 0 if it was a
+                        * longopt.
+                        */
+                       if (optopt != 0) {
+                               (void) fprintf(stderr,
+                                   gettext("invalid option '%c'\n"), optopt);
+                       } else {
+                               (void) fprintf(stderr,
+                                   gettext("invalid option '%s'\n"),
+                                   argv[optind - 1]);
+
+                       }
                        usage(B_FALSE);
                }
        }
@@ -3834,7 +4077,7 @@ zfs_do_send(int argc, char **argv)
 
        if (resume_token != NULL) {
                if (fromname != NULL || flags.replicate || flags.props ||
-                   flags.dedup) {
+                   flags.backup || flags.dedup) {
                        (void) fprintf(stderr,
                            gettext("invalid flags combined with -t\n"));
                        usage(B_FALSE);
@@ -3874,13 +4117,12 @@ zfs_do_send(int argc, char **argv)
        if (strchr(argv[0], '@') == NULL ||
            (fromname && strchr(fromname, '#') != NULL)) {
                char frombuf[ZFS_MAX_DATASET_NAME_LEN];
-               enum lzc_send_flags lzc_flags = 0;
 
                if (flags.replicate || flags.doall || flags.props ||
-                   flags.dedup || flags.dryrun || flags.verbose ||
-                   flags.progress) {
-                       (void) fprintf(stderr,
-                           gettext("Error: "
+                   flags.backup || flags.dedup ||
+                   (strchr(argv[0], '@') == NULL &&
+                   (flags.dryrun || flags.verbose || flags.progress))) {
+                       (void) fprintf(stderr, gettext("Error: "
                            "Unsupported flag with filesystem or bookmark.\n"));
                        return (1);
                }
@@ -3889,13 +4131,6 @@ zfs_do_send(int argc, char **argv)
                if (zhp == NULL)
                        return (1);
 
-               if (flags.largeblock)
-                       lzc_flags |= LZC_SEND_FLAG_LARGE_BLOCK;
-               if (flags.embed_data)
-                       lzc_flags |= LZC_SEND_FLAG_EMBED_DATA;
-               if (flags.compress)
-                       lzc_flags |= LZC_SEND_FLAG_COMPRESS;
-
                if (fromname != NULL &&
                    (fromname[0] == '#' || fromname[0] == '@')) {
                        /*
@@ -3909,7 +4144,7 @@ zfs_do_send(int argc, char **argv)
                        (void) strlcat(frombuf, fromname, sizeof (frombuf));
                        fromname = frombuf;
                }
-               err = zfs_send_one(zhp, fromname, STDOUT_FILENO, lzc_flags);
+               err = zfs_send_one(zhp, fromname, STDOUT_FILENO, flags);
                zfs_close(zhp);
                return (err != 0);
        }
@@ -3980,23 +4215,27 @@ zfs_do_send(int argc, char **argv)
 static int
 zfs_do_receive(int argc, char **argv)
 {
-       int c, err;
+       int c, err = 0;
        recvflags_t flags = { 0 };
        boolean_t abort_resumable = B_FALSE;
-
        nvlist_t *props;
-       nvpair_t *nvp = NULL;
 
        if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
                nomem();
 
        /* check options */
-       while ((c = getopt(argc, argv, ":o:denuvFsA")) != -1) {
+       while ((c = getopt(argc, argv, ":o:x:denuvFsA")) != -1) {
                switch (c) {
                case 'o':
-                       if (parseprop(props, optarg) != 0) {
+                       if (!parseprop(props, optarg)) {
                                nvlist_free(props);
-                               return (1);
+                               usage(B_FALSE);
+                       }
+                       break;
+               case 'x':
+                       if (!parsepropname(props, optarg)) {
+                               nvlist_free(props);
+                               usage(B_FALSE);
                        }
                        break;
                case 'd':
@@ -4049,17 +4288,10 @@ zfs_do_receive(int argc, char **argv)
                usage(B_FALSE);
        }
 
-       while ((nvp = nvlist_next_nvpair(props, nvp))) {
-               if (strcmp(nvpair_name(nvp), "origin") != 0) {
-                       (void) fprintf(stderr, gettext("invalid option"));
-                       usage(B_FALSE);
-               }
-       }
-
        if (abort_resumable) {
                if (flags.isprefix || flags.istail || flags.dryrun ||
                    flags.resumable || flags.nomount) {
-                       (void) fprintf(stderr, gettext("invalid option"));
+                       (void) fprintf(stderr, gettext("invalid option\n"));
                        usage(B_FALSE);
                }
 
@@ -4145,6 +4377,14 @@ zfs_do_receive(int argc, char **argv)
 #define        ZFS_DELEG_PERM_RELEASE          "release"
 #define        ZFS_DELEG_PERM_DIFF             "diff"
 #define        ZFS_DELEG_PERM_BOOKMARK         "bookmark"
+#define        ZFS_DELEG_PERM_REMAP            "remap"
+#define        ZFS_DELEG_PERM_LOAD_KEY         "load-key"
+#define        ZFS_DELEG_PERM_CHANGE_KEY       "change-key"
+
+#define        ZFS_DELEG_PERM_PROJECTUSED      "projectused"
+#define        ZFS_DELEG_PERM_PROJECTQUOTA     "projectquota"
+#define        ZFS_DELEG_PERM_PROJECTOBJUSED   "projectobjused"
+#define        ZFS_DELEG_PERM_PROJECTOBJQUOTA  "projectobjquota"
 
 #define        ZFS_NUM_DELEG_NOTES ZFS_DELEG_NOTE_NONE
 
@@ -4165,6 +4405,9 @@ static zfs_deleg_perm_tab_t zfs_deleg_perm_tbl[] = {
        { ZFS_DELEG_PERM_SHARE, ZFS_DELEG_NOTE_SHARE },
        { ZFS_DELEG_PERM_SNAPSHOT, ZFS_DELEG_NOTE_SNAPSHOT },
        { ZFS_DELEG_PERM_BOOKMARK, ZFS_DELEG_NOTE_BOOKMARK },
+       { ZFS_DELEG_PERM_REMAP, ZFS_DELEG_NOTE_REMAP },
+       { ZFS_DELEG_PERM_LOAD_KEY, ZFS_DELEG_NOTE_LOAD_KEY },
+       { ZFS_DELEG_PERM_CHANGE_KEY, ZFS_DELEG_NOTE_CHANGE_KEY },
 
        { ZFS_DELEG_PERM_GROUPQUOTA, ZFS_DELEG_NOTE_GROUPQUOTA },
        { ZFS_DELEG_PERM_GROUPUSED, ZFS_DELEG_NOTE_GROUPUSED },
@@ -4175,6 +4418,10 @@ static zfs_deleg_perm_tab_t zfs_deleg_perm_tbl[] = {
        { ZFS_DELEG_PERM_USEROBJUSED, ZFS_DELEG_NOTE_USEROBJUSED },
        { ZFS_DELEG_PERM_GROUPOBJQUOTA, ZFS_DELEG_NOTE_GROUPOBJQUOTA },
        { ZFS_DELEG_PERM_GROUPOBJUSED, ZFS_DELEG_NOTE_GROUPOBJUSED },
+       { ZFS_DELEG_PERM_PROJECTUSED, ZFS_DELEG_NOTE_PROJECTUSED },
+       { ZFS_DELEG_PERM_PROJECTQUOTA, ZFS_DELEG_NOTE_PROJECTQUOTA },
+       { ZFS_DELEG_PERM_PROJECTOBJUSED, ZFS_DELEG_NOTE_PROJECTOBJUSED },
+       { ZFS_DELEG_PERM_PROJECTOBJQUOTA, ZFS_DELEG_NOTE_PROJECTOBJQUOTA },
        { NULL, ZFS_DELEG_NOTE_NONE }
 };
 
@@ -4256,6 +4503,10 @@ deleg_perm_type(zfs_deleg_note_t note)
        case ZFS_DELEG_NOTE_USEROBJUSED:
        case ZFS_DELEG_NOTE_GROUPOBJQUOTA:
        case ZFS_DELEG_NOTE_GROUPOBJUSED:
+       case ZFS_DELEG_NOTE_PROJECTUSED:
+       case ZFS_DELEG_NOTE_PROJECTQUOTA:
+       case ZFS_DELEG_NOTE_PROJECTOBJUSED:
+       case ZFS_DELEG_NOTE_PROJECTOBJQUOTA:
                /* other */
                return (gettext("other"));
        default:
@@ -4263,7 +4514,7 @@ deleg_perm_type(zfs_deleg_note_t note)
        }
 }
 
-static int inline
+static int
 who_type2weight(zfs_deleg_who_type_t who_type)
 {
        int res;
@@ -4483,7 +4734,7 @@ fs_perm_fini(fs_perm_t *fsperm)
        uu_avl_destroy(fsperm->fsp_uge_avl);
 }
 
-static void inline
+static void
 set_deleg_perm_node(uu_avl_t *avl, deleg_perm_node_t *node,
     zfs_deleg_who_type_t who_type, const char *name, char locality)
 {
@@ -4580,8 +4831,9 @@ parse_fs_perm(fs_perm_t *fsperm, nvlist_t *nvl)
                        avl_pool = fspset->fsps_who_perm_avl_pool;
                        avl = fsperm->fsp_uge_avl;
                        break;
+
                default:
-                       break;
+                       assert(!"unhandled zfs_deleg_who_type_t");
                }
 
                if (is_set) {
@@ -4617,6 +4869,7 @@ parse_fs_perm(fs_perm_t *fsperm, nvlist_t *nvl)
                                                if (g)
                                                        nice_name = g->gr_name;
                                                break;
+
                                        default:
                                                break;
                                        }
@@ -4738,6 +4991,12 @@ deleg_perm_comment(zfs_deleg_note_t note)
        case ZFS_DELEG_NOTE_SNAPSHOT:
                str = gettext("");
                break;
+       case ZFS_DELEG_NOTE_LOAD_KEY:
+               str = gettext("Allows loading or unloading an encryption key");
+               break;
+       case ZFS_DELEG_NOTE_CHANGE_KEY:
+               str = gettext("Allows changing or adding an encryption key");
+               break;
 /*
  *     case ZFS_DELEG_NOTE_VSCAN:
  *             str = gettext("");
@@ -4772,6 +5031,20 @@ deleg_perm_comment(zfs_deleg_note_t note)
        case ZFS_DELEG_NOTE_USEROBJUSED:
                str = gettext("Allows reading any userobjused@... property");
                break;
+       case ZFS_DELEG_NOTE_PROJECTQUOTA:
+               str = gettext("Allows accessing any projectquota@... property");
+               break;
+       case ZFS_DELEG_NOTE_PROJECTOBJQUOTA:
+               str = gettext("Allows accessing any \n\t\t\t\t"
+                   "projectobjquota@... property");
+               break;
+       case ZFS_DELEG_NOTE_PROJECTUSED:
+               str = gettext("Allows reading any projectused@... property");
+               break;
+       case ZFS_DELEG_NOTE_PROJECTOBJUSED:
+               str = gettext("Allows accessing any \n\t\t\t\t"
+                   "projectobjused@... property");
+               break;
                /* other */
        default:
                str = "";
@@ -4954,8 +5227,8 @@ store_allow_perm(zfs_deleg_who_type_t type, boolean_t local, boolean_t descend,
        int i;
        char ld[2] = { '\0', '\0' };
        char who_buf[MAXNAMELEN + 32];
-       char base_type = ZFS_DELEG_WHO_UNKNOWN;
-       char set_type = ZFS_DELEG_WHO_UNKNOWN;
+       char base_type = '\0';
+       char set_type = '\0';
        nvlist_t *base_nvl = NULL;
        nvlist_t *set_nvl = NULL;
        nvlist_t *nvl;
@@ -5004,8 +5277,10 @@ store_allow_perm(zfs_deleg_who_type_t type, boolean_t local, boolean_t descend,
                        ld[0] = ZFS_DELEG_LOCAL;
                if (descend)
                        ld[1] = ZFS_DELEG_DESCENDENT;
-       default:
                break;
+
+       default:
+               assert(set_type != '\0' && base_type != '\0');
        }
 
        if (perms != NULL) {
@@ -5239,7 +5514,7 @@ print_set_creat_perms(uu_avl_t *who_avl)
        }
 }
 
-static void inline
+static void
 print_uge_deleg_perms(uu_avl_t *who_avl, boolean_t local, boolean_t descend,
     const char *title)
 {
@@ -5290,8 +5565,10 @@ print_uge_deleg_perms(uu_avl_t *who_avl, boolean_t local, boolean_t descend,
                                case ZFS_DELEG_EVERYONE:
                                        who = gettext("everyone");
                                        who_name = NULL;
-                               default:
                                        break;
+
+                               default:
+                                       assert(who != NULL);
                                }
 
                                prt_who = B_FALSE;
@@ -5625,8 +5902,6 @@ print_holds(boolean_t scripted, int nwidth, int tagwidth, nvlist_t *nvl)
                        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;
@@ -5634,8 +5909,13 @@ print_holds(boolean_t scripted, int nwidth, int tagwidth, nvlist_t *nvl)
                        (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);
+                       if (scripted) {
+                               (void) printf("%s\t%s\t%s\n", zname,
+                                   tagname, tsbuf);
+                       } else {
+                               (void) printf("%-*s  %-*s  %s\n", nwidth,
+                                   zname, tagwidth, tagname, tsbuf);
+                       }
                }
        }
 }
@@ -5964,6 +6244,22 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol,
                return (0);
        }
 
+       /*
+        * If this filesystem is encrypted and does not have
+        * a loaded key, we can not mount it.
+        */
+       if ((flags & MS_CRYPT) == 0 &&
+           zfs_prop_get_int(zhp, ZFS_PROP_ENCRYPTION) != ZIO_CRYPT_OFF &&
+           zfs_prop_get_int(zhp, ZFS_PROP_KEYSTATUS) ==
+           ZFS_KEYSTATUS_UNAVAILABLE) {
+               if (!explicit)
+                       return (0);
+
+               (void) fprintf(stderr, gettext("cannot %s '%s': "
+                   "encryption key not loaded\n"), cmdname, zfs_get_name(zhp));
+               return (1);
+       }
+
        /*
         * If this filesystem is inconsistent and has a receive resume
         * token, we can not mount it.
@@ -5976,7 +6272,7 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol,
 
                (void) fprintf(stderr, gettext("cannot %s '%s': "
                    "Contains partially-completed state from "
-                   "\"zfs receive -r\", which can be resumed with "
+                   "\"zfs receive -s\", which can be resumed with "
                    "\"zfs send -t\"\n"),
                    cmdname, zfs_get_name(zhp));
                return (1);
@@ -5996,10 +6292,10 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol,
                shared_smb = zfs_is_shared_smb(zhp, NULL);
 
                if ((shared_nfs && shared_smb) ||
-                   ((shared_nfs && strcmp(shareopts, "on") == 0) &&
-                   (strcmp(smbshareopts, "off") == 0)) ||
-                   ((shared_smb && strcmp(smbshareopts, "on") == 0) &&
-                   (strcmp(shareopts, "off") == 0))) {
+                   (shared_nfs && strcmp(shareopts, "on") == 0 &&
+                   strcmp(smbshareopts, "off") == 0) ||
+                   (shared_smb && strcmp(smbshareopts, "on") == 0 &&
+                   strcmp(shareopts, "off") == 0)) {
                        if (!explicit)
                                return (0);
 
@@ -6010,7 +6306,7 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol,
                }
 
                if (!zfs_is_mounted(zhp, NULL) &&
-                   zfs_mount(zhp, NULL, 0) != 0)
+                   zfs_mount(zhp, NULL, flags) != 0)
                        return (1);
 
                if (protocol == NULL) {
@@ -6117,7 +6413,7 @@ share_mount(int op, int argc, char **argv)
        int flags = 0;
 
        /* check options */
-       while ((c = getopt(argc, argv, op == OP_MOUNT ? ":avo:O" : "a"))
+       while ((c = getopt(argc, argv, op == OP_MOUNT ? ":alvo:O" : "al"))
            != -1) {
                switch (c) {
                case 'a':
@@ -6126,6 +6422,9 @@ share_mount(int op, int argc, char **argv)
                case 'v':
                        verbose = B_TRUE;
                        break;
+               case 'l':
+                       flags |= MS_CRYPT;
+                       break;
                case 'o':
                        if (*optarg == '\0') {
                                (void) fprintf(stderr, gettext("empty mount "
@@ -6436,7 +6735,7 @@ unshare_unmount(int op, int argc, char **argv)
        char sharesmb[ZFS_MAXPROPLEN];
 
        /* check options */
-       while ((c = getopt(argc, argv, op == OP_SHARE ? "a" : "af")) != -1) {
+       while ((c = getopt(argc, argv, op == OP_SHARE ? ":a" : "af")) != -1) {
                switch (c) {
                case 'a':
                        do_all = 1;
@@ -6444,6 +6743,11 @@ unshare_unmount(int op, int argc, char **argv)
                case 'f':
                        flags = MS_FORCE;
                        break;
+               case ':':
+                       (void) fprintf(stderr, gettext("missing argument for "
+                           "'%c' option\n"), optopt);
+                       usage(B_FALSE);
+                       break;
                case '?':
                        (void) fprintf(stderr, gettext("invalid option '%c'\n"),
                            optopt);
@@ -6475,6 +6779,19 @@ unshare_unmount(int op, int argc, char **argv)
                unshare_unmount_node_t *node;
                uu_avl_index_t idx;
                uu_avl_walk_t *walk;
+               char *protocol = NULL;
+
+               if (op == OP_SHARE && argc > 0) {
+                       if (strcmp(argv[0], "nfs") != 0 &&
+                           strcmp(argv[0], "smb") != 0) {
+                               (void) fprintf(stderr, gettext("share type "
+                                   "must be 'nfs' or 'smb'\n"));
+                               usage(B_FALSE);
+                       }
+                       protocol = argv[0];
+                       argc--;
+                       argv++;
+               }
 
                if (argc != 0) {
                        (void) fprintf(stderr, gettext("too many arguments\n"));
@@ -6508,6 +6825,15 @@ unshare_unmount(int op, int argc, char **argv)
                                continue;
                        }
 
+                       /*
+                        * Ignore datasets that are excluded/restricted by
+                        * parent pool name.
+                        */
+                       if (zpool_skip_pool(zfs_get_pool_name(zhp))) {
+                               zfs_close(zhp);
+                               continue;
+                       }
+
                        switch (op) {
                        case OP_SHARE:
                                verify(zfs_prop_get(zhp, ZFS_PROP_SHARENFS,
@@ -6567,14 +6893,14 @@ unshare_unmount(int op, int argc, char **argv)
 
                        switch (op) {
                        case OP_SHARE:
-                               if (zfs_unshareall_bypath(node->un_zhp,
-                                   node->un_mountp) != 0)
+                               if (zfs_unshareall_bytype(node->un_zhp,
+                                   node->un_mountp, protocol) != 0)
                                        ret = 1;
                                break;
 
                        case OP_MOUNT:
                                if (zfs_unmount(node->un_zhp,
-                                   node->un_mountp, flags) != 0)
+                                   node->un_zhp->zfs_name, flags) != 0)
                                        ret = 1;
                                break;
                        }
@@ -6749,7 +7075,7 @@ zfs_do_diff(int argc, char **argv)
 
        if (argc < 1) {
                (void) fprintf(stderr,
-               gettext("must provide at least one snapshot name\n"));
+                   gettext("must provide at least one snapshot name\n"));
                usage(B_FALSE);
        }
 
@@ -6769,7 +7095,7 @@ zfs_do_diff(int argc, char **argv)
        if (copy == NULL)
                usage(B_FALSE);
 
-       if ((atp = strchr(copy, '@')))
+       if ((atp = strchr(copy, '@')) != NULL)
                *atp = '\0';
 
        if ((zhp = zfs_open(g_zfs, copy, ZFS_TYPE_FILESYSTEM)) == NULL) {
@@ -6791,6 +7117,40 @@ zfs_do_diff(int argc, char **argv)
        return (err != 0);
 }
 
+
+/*
+ * zfs remap <filesystem | volume>
+ *
+ * Remap the indirect blocks in the given fileystem or volume.
+ */
+static int
+zfs_do_remap(int argc, char **argv)
+{
+       const char *fsname;
+       int err = 0;
+       int c;
+
+       /* check options */
+       while ((c = getopt(argc, argv, "")) != -1) {
+               switch (c) {
+               case '?':
+                       (void) fprintf(stderr,
+                           gettext("invalid option '%c'\n"), optopt);
+                       usage(B_FALSE);
+               }
+       }
+
+       if (argc != 2) {
+               (void) fprintf(stderr, gettext("wrong number of arguments\n"));
+               usage(B_FALSE);
+       }
+
+       fsname = argv[1];
+       err = zfs_remap_indirects(g_zfs, fsname);
+
+       return (err);
+}
+
 /*
  * zfs bookmark <fs@snap> <fs#bmark>
  *
@@ -6800,6 +7160,7 @@ static int
 zfs_do_bookmark(int argc, char **argv)
 {
        char snapname[ZFS_MAX_DATASET_NAME_LEN];
+       char bookname[ZFS_MAX_DATASET_NAME_LEN];
        zfs_handle_t *zhp;
        nvlist_t *nvl;
        int ret = 0;
@@ -6828,9 +7189,15 @@ zfs_do_bookmark(int argc, char **argv)
                goto usage;
        }
 
+       if (strchr(argv[0], '@') == NULL) {
+               (void) fprintf(stderr,
+                   gettext("invalid snapshot name '%s': "
+                   "must contain a '@'\n"), argv[0]);
+               goto usage;
+       }
        if (strchr(argv[1], '#') == NULL) {
                (void) fprintf(stderr,
-                   gettext("invalid bookmark name '%s' -- "
+                   gettext("invalid bookmark name '%s': "
                    "must contain a '#'\n"), argv[1]);
                goto usage;
        }
@@ -6846,6 +7213,18 @@ zfs_do_bookmark(int argc, char **argv)
        } else {
                (void) strlcpy(snapname, argv[0], sizeof (snapname));
        }
+       if (argv[1][0] == '#') {
+               /*
+                * Bookmark name begins with #.
+                * Default to same fs as snapshot.
+                */
+               (void) strlcpy(bookname, argv[0], sizeof (bookname));
+               *strchr(bookname, '@') = '\0';
+               (void) strlcat(bookname, argv[1], sizeof (bookname));
+       } else {
+               (void) strlcpy(bookname, argv[1], sizeof (bookname));
+       }
+
        zhp = zfs_open(g_zfs, snapname, ZFS_TYPE_SNAPSHOT);
        if (zhp == NULL)
                goto usage;
@@ -6853,7 +7232,7 @@ zfs_do_bookmark(int argc, char **argv)
 
 
        nvl = fnvlist_alloc();
-       fnvlist_add_string(nvl, argv[1], snapname);
+       fnvlist_add_string(nvl, bookname, snapname);
        ret = lzc_bookmark(nvl, NULL);
        fnvlist_free(nvl);
 
@@ -6863,7 +7242,7 @@ zfs_do_bookmark(int argc, char **argv)
 
                (void) snprintf(errbuf, sizeof (errbuf),
                    dgettext(TEXT_DOMAIN,
-                   "cannot create bookmark '%s'"), argv[1]);
+                   "cannot create bookmark '%s'"), bookname);
 
                switch (ret) {
                case EXDEV:
@@ -6881,6 +7260,9 @@ zfs_do_bookmark(int argc, char **argv)
                case ENOSPC:
                        err_msg = "out of space";
                        break;
+               case ENOENT:
+                       err_msg = "dataset does not exist";
+                       break;
                default:
                        err_msg = "unknown error";
                        break;
@@ -6896,17 +7278,640 @@ usage:
        return (-1);
 }
 
-int
-main(int argc, char **argv)
+static int
+zfs_do_channel_program(int argc, char **argv)
 {
-       int ret = 0;
-       int i = 0;
-       char *cmdname;
+       int ret, fd, c;
+       char *progbuf, *filename, *poolname;
+       size_t progsize, progread;
+       nvlist_t *outnvl;
+       uint64_t instrlimit = ZCP_DEFAULT_INSTRLIMIT;
+       uint64_t memlimit = ZCP_DEFAULT_MEMLIMIT;
+       boolean_t sync_flag = B_TRUE, json_output = B_FALSE;
+       zpool_handle_t *zhp;
 
-       (void) setlocale(LC_ALL, "");
-       (void) textdomain(TEXT_DOMAIN);
+       /* check options */
+       while ((c = getopt(argc, argv, "nt:m:j")) != -1) {
+               switch (c) {
+               case 't':
+               case 'm': {
+                       uint64_t arg;
+                       char *endp;
+
+                       errno = 0;
+                       arg = strtoull(optarg, &endp, 0);
+                       if (errno != 0 || *endp != '\0') {
+                               (void) fprintf(stderr, gettext(
+                                   "invalid argument "
+                                   "'%s': expected integer\n"), optarg);
+                               goto usage;
+                       }
 
-       dprintf_setup(&argc, argv);
+                       if (c == 't') {
+                               instrlimit = arg;
+                       } else {
+                               ASSERT3U(c, ==, 'm');
+                               memlimit = arg;
+                       }
+                       break;
+               }
+               case 'n': {
+                       sync_flag = B_FALSE;
+                       break;
+               }
+               case 'j': {
+                       json_output = B_TRUE;
+                       break;
+               }
+               case '?':
+                       (void) fprintf(stderr, gettext("invalid option '%c'\n"),
+                           optopt);
+                       goto usage;
+               }
+       }
+
+       argc -= optind;
+       argv += optind;
+
+       if (argc < 2) {
+               (void) fprintf(stderr,
+                   gettext("invalid number of arguments\n"));
+               goto usage;
+       }
+
+       poolname = argv[0];
+       filename = argv[1];
+       if (strcmp(filename, "-") == 0) {
+               fd = 0;
+               filename = "standard input";
+       } else if ((fd = open(filename, O_RDONLY)) < 0) {
+               (void) fprintf(stderr, gettext("cannot open '%s': %s\n"),
+                   filename, strerror(errno));
+               return (1);
+       }
+
+       if ((zhp = zpool_open(g_zfs, poolname)) == NULL) {
+               (void) fprintf(stderr, gettext("cannot open pool '%s'"),
+                   poolname);
+               if (fd != 0)
+                       (void) close(fd);
+               return (1);
+       }
+       zpool_close(zhp);
+
+       /*
+        * Read in the channel program, expanding the program buffer as
+        * necessary.
+        */
+       progread = 0;
+       progsize = 1024;
+       progbuf = safe_malloc(progsize);
+       do {
+               ret = read(fd, progbuf + progread, progsize - progread);
+               progread += ret;
+               if (progread == progsize && ret > 0) {
+                       progsize *= 2;
+                       progbuf = safe_realloc(progbuf, progsize);
+               }
+       } while (ret > 0);
+
+       if (fd != 0)
+               (void) close(fd);
+       if (ret < 0) {
+               free(progbuf);
+               (void) fprintf(stderr,
+                   gettext("cannot read '%s': %s\n"),
+                   filename, strerror(errno));
+               return (1);
+       }
+       progbuf[progread] = '\0';
+
+       /*
+        * Any remaining arguments are passed as arguments to the lua script as
+        * a string array:
+        * {
+        *      "argv" -> [ "arg 1", ... "arg n" ],
+        * }
+        */
+       nvlist_t *argnvl = fnvlist_alloc();
+       fnvlist_add_string_array(argnvl, ZCP_ARG_CLIARGV, argv + 2, argc - 2);
+
+       if (sync_flag) {
+               ret = lzc_channel_program(poolname, progbuf,
+                   instrlimit, memlimit, argnvl, &outnvl);
+       } else {
+               ret = lzc_channel_program_nosync(poolname, progbuf,
+                   instrlimit, memlimit, argnvl, &outnvl);
+       }
+
+       if (ret != 0) {
+               /*
+                * On error, report the error message handed back by lua if one
+                * exists.  Otherwise, generate an appropriate error message,
+                * falling back on strerror() for an unexpected return code.
+                */
+               char *errstring = NULL;
+               uint64_t instructions = 0;
+               if (nvlist_exists(outnvl, ZCP_RET_ERROR)) {
+                       (void) nvlist_lookup_string(outnvl,
+                           ZCP_RET_ERROR, &errstring);
+                       if (errstring == NULL)
+                               errstring = strerror(ret);
+                       if (ret == ETIME) {
+                               (void) nvlist_lookup_uint64(outnvl,
+                                   ZCP_ARG_INSTRLIMIT, &instructions);
+                       }
+               } else {
+                       switch (ret) {
+                       case EINVAL:
+                               errstring =
+                                   "Invalid instruction or memory limit.";
+                               break;
+                       case ENOMEM:
+                               errstring = "Return value too large.";
+                               break;
+                       case ENOSPC:
+                               errstring = "Memory limit exhausted.";
+                               break;
+                       case ETIME:
+                               errstring = "Timed out.";
+                               break;
+                       case EPERM:
+                               errstring = "Permission denied. Channel "
+                                   "programs must be run as root.";
+                               break;
+                       default:
+                               errstring = strerror(ret);
+                       }
+               }
+               (void) fprintf(stderr,
+                   gettext("Channel program execution failed:\n%s\n"),
+                   errstring);
+               if (ret == ETIME && instructions != 0)
+                       (void) fprintf(stderr,
+                           gettext("%llu Lua instructions\n"),
+                           (u_longlong_t)instructions);
+       } else {
+               if (json_output) {
+                       (void) nvlist_print_json(stdout, outnvl);
+               } else if (nvlist_empty(outnvl)) {
+                       (void) fprintf(stdout, gettext("Channel program fully "
+                           "executed and did not produce output.\n"));
+               } else {
+                       (void) fprintf(stdout, gettext("Channel program fully "
+                           "executed and produced output:\n"));
+                       dump_nvlist(outnvl, 4);
+               }
+       }
+
+       free(progbuf);
+       fnvlist_free(outnvl);
+       fnvlist_free(argnvl);
+       return (ret != 0);
+
+usage:
+       usage(B_FALSE);
+       return (-1);
+}
+
+
+typedef struct loadkey_cbdata {
+       boolean_t cb_loadkey;
+       boolean_t cb_recursive;
+       boolean_t cb_noop;
+       char *cb_keylocation;
+       uint64_t cb_numfailed;
+       uint64_t cb_numattempted;
+} loadkey_cbdata_t;
+
+static int
+load_key_callback(zfs_handle_t *zhp, void *data)
+{
+       int ret;
+       boolean_t is_encroot;
+       loadkey_cbdata_t *cb = data;
+       uint64_t keystatus = zfs_prop_get_int(zhp, ZFS_PROP_KEYSTATUS);
+
+       /*
+        * If we are working recursively, we want to skip loading / unloading
+        * keys for non-encryption roots and datasets whose keys are already
+        * in the desired end-state.
+        */
+       if (cb->cb_recursive) {
+               ret = zfs_crypto_get_encryption_root(zhp, &is_encroot, NULL);
+               if (ret != 0)
+                       return (ret);
+               if (!is_encroot)
+                       return (0);
+
+               if ((cb->cb_loadkey && keystatus == ZFS_KEYSTATUS_AVAILABLE) ||
+                   (!cb->cb_loadkey && keystatus == ZFS_KEYSTATUS_UNAVAILABLE))
+                       return (0);
+       }
+
+       cb->cb_numattempted++;
+
+       if (cb->cb_loadkey)
+               ret = zfs_crypto_load_key(zhp, cb->cb_noop, cb->cb_keylocation);
+       else
+               ret = zfs_crypto_unload_key(zhp);
+
+       if (ret != 0) {
+               cb->cb_numfailed++;
+               return (ret);
+       }
+
+       return (0);
+}
+
+static int
+load_unload_keys(int argc, char **argv, boolean_t loadkey)
+{
+       int c, ret = 0, flags = 0;
+       boolean_t do_all = B_FALSE;
+       loadkey_cbdata_t cb = { 0 };
+
+       cb.cb_loadkey = loadkey;
+
+       while ((c = getopt(argc, argv, "anrL:")) != -1) {
+               /* noop and alternate keylocations only apply to zfs load-key */
+               if (loadkey) {
+                       switch (c) {
+                       case 'n':
+                               cb.cb_noop = B_TRUE;
+                               continue;
+                       case 'L':
+                               cb.cb_keylocation = optarg;
+                               continue;
+                       default:
+                               break;
+                       }
+               }
+
+               switch (c) {
+               case 'a':
+                       do_all = B_TRUE;
+                       cb.cb_recursive = B_TRUE;
+                       break;
+               case 'r':
+                       flags |= ZFS_ITER_RECURSE;
+                       cb.cb_recursive = B_TRUE;
+                       break;
+               default:
+                       (void) fprintf(stderr,
+                           gettext("invalid option '%c'\n"), optopt);
+                       usage(B_FALSE);
+               }
+       }
+
+       argc -= optind;
+       argv += optind;
+
+       if (!do_all && argc == 0) {
+               (void) fprintf(stderr,
+                   gettext("Missing dataset argument or -a option\n"));
+               usage(B_FALSE);
+       }
+
+       if (do_all && argc != 0) {
+               (void) fprintf(stderr,
+                   gettext("Cannot specify dataset with -a option\n"));
+               usage(B_FALSE);
+       }
+
+       if (cb.cb_recursive && cb.cb_keylocation != NULL &&
+           strcmp(cb.cb_keylocation, "prompt") != 0) {
+               (void) fprintf(stderr, gettext("alternate keylocation may only "
+                   "be 'prompt' with -r or -a\n"));
+               usage(B_FALSE);
+       }
+
+       ret = zfs_for_each(argc, argv, flags,
+           ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, NULL, NULL, 0,
+           load_key_callback, &cb);
+
+       if (cb.cb_noop || (cb.cb_recursive && cb.cb_numattempted != 0)) {
+               (void) printf(gettext("%llu / %llu key(s) successfully %s\n"),
+                   (u_longlong_t)(cb.cb_numattempted - cb.cb_numfailed),
+                   (u_longlong_t)cb.cb_numattempted,
+                   loadkey ? (cb.cb_noop ? "verified" : "loaded") :
+                   "unloaded");
+       }
+
+       if (cb.cb_numfailed != 0)
+               ret = -1;
+
+       return (ret);
+}
+
+static int
+zfs_do_load_key(int argc, char **argv)
+{
+       return (load_unload_keys(argc, argv, B_TRUE));
+}
+
+
+static int
+zfs_do_unload_key(int argc, char **argv)
+{
+       return (load_unload_keys(argc, argv, B_FALSE));
+}
+
+static int
+zfs_do_change_key(int argc, char **argv)
+{
+       int c, ret;
+       uint64_t keystatus;
+       boolean_t loadkey = B_FALSE, inheritkey = B_FALSE;
+       zfs_handle_t *zhp = NULL;
+       nvlist_t *props = fnvlist_alloc();
+
+       while ((c = getopt(argc, argv, "lio:")) != -1) {
+               switch (c) {
+               case 'l':
+                       loadkey = B_TRUE;
+                       break;
+               case 'i':
+                       inheritkey = B_TRUE;
+                       break;
+               case 'o':
+                       if (!parseprop(props, optarg)) {
+                               nvlist_free(props);
+                               return (1);
+                       }
+                       break;
+               default:
+                       (void) fprintf(stderr,
+                           gettext("invalid option '%c'\n"), optopt);
+                       usage(B_FALSE);
+               }
+       }
+
+       if (inheritkey && !nvlist_empty(props)) {
+               (void) fprintf(stderr,
+                   gettext("Properties not allowed for inheriting\n"));
+               usage(B_FALSE);
+       }
+
+       argc -= optind;
+       argv += optind;
+
+       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);
+       }
+
+       zhp = zfs_open(g_zfs, argv[argc - 1],
+           ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
+       if (zhp == NULL)
+               usage(B_FALSE);
+
+       if (loadkey) {
+               keystatus = zfs_prop_get_int(zhp, ZFS_PROP_KEYSTATUS);
+               if (keystatus != ZFS_KEYSTATUS_AVAILABLE) {
+                       ret = zfs_crypto_load_key(zhp, B_FALSE, NULL);
+                       if (ret != 0) {
+                               nvlist_free(props);
+                               zfs_close(zhp);
+                               return (-1);
+                       }
+               }
+
+               /* refresh the properties so the new keystatus is visible */
+               zfs_refresh_properties(zhp);
+       }
+
+       ret = zfs_crypto_rewrap(zhp, props, inheritkey);
+       if (ret != 0) {
+               nvlist_free(props);
+               zfs_close(zhp);
+               return (-1);
+       }
+
+       nvlist_free(props);
+       zfs_close(zhp);
+       return (0);
+}
+
+/*
+ * 1) zfs project [-d|-r] <file|directory ...>
+ *    List project ID and inherit flag of file(s) or directories.
+ *    -d: List the directory itself, not its children.
+ *    -r: List subdirectories recursively.
+ *
+ * 2) zfs project -C [-k] [-r] <file|directory ...>
+ *    Clear project inherit flag and/or ID on the file(s) or directories.
+ *    -k: Keep the project ID unchanged. If not specified, the project ID
+ *       will be reset as zero.
+ *    -r: Clear on subdirectories recursively.
+ *
+ * 3) zfs project -c [-0] [-d|-r] [-p id] <file|directory ...>
+ *    Check project ID and inherit flag on the file(s) or directories,
+ *    report the outliers.
+ *    -0: Print file name followed by a NUL instead of newline.
+ *    -d: Check the directory itself, not its children.
+ *    -p: Specify the referenced ID for comparing with the target file(s)
+ *       or directories' project IDs. If not specified, the target (top)
+ *       directory's project ID will be used as the referenced one.
+ *    -r: Check subdirectories recursively.
+ *
+ * 4) zfs project [-p id] [-r] [-s] <file|directory ...>
+ *    Set project ID and/or inherit flag on the file(s) or directories.
+ *    -p: Set the project ID as the given id.
+ *    -r: Set on subdirectorie recursively. If not specify "-p" option,
+ *       it will use top-level directory's project ID as the given id,
+ *       then set both project ID and inherit flag on all descendants
+ *       of the top-level directory.
+ *    -s: Set project inherit flag.
+ */
+static int
+zfs_do_project(int argc, char **argv)
+{
+       zfs_project_control_t zpc = {
+               .zpc_expected_projid = ZFS_INVALID_PROJID,
+               .zpc_op = ZFS_PROJECT_OP_DEFAULT,
+               .zpc_dironly = B_FALSE,
+               .zpc_keep_projid = B_FALSE,
+               .zpc_newline = B_TRUE,
+               .zpc_recursive = B_FALSE,
+               .zpc_set_flag = B_FALSE,
+       };
+       int ret = 0, c;
+
+       if (argc < 2)
+               usage(B_FALSE);
+
+       while ((c = getopt(argc, argv, "0Ccdkp:rs")) != -1) {
+               switch (c) {
+               case '0':
+                       zpc.zpc_newline = B_FALSE;
+                       break;
+               case 'C':
+                       if (zpc.zpc_op != ZFS_PROJECT_OP_DEFAULT) {
+                               (void) fprintf(stderr, gettext("cannot "
+                                   "specify '-C' '-c' '-s' together\n"));
+                               usage(B_FALSE);
+                       }
+
+                       zpc.zpc_op = ZFS_PROJECT_OP_CLEAR;
+                       break;
+               case 'c':
+                       if (zpc.zpc_op != ZFS_PROJECT_OP_DEFAULT) {
+                               (void) fprintf(stderr, gettext("cannot "
+                                   "specify '-C' '-c' '-s' together\n"));
+                               usage(B_FALSE);
+                       }
+
+                       zpc.zpc_op = ZFS_PROJECT_OP_CHECK;
+                       break;
+               case 'd':
+                       zpc.zpc_dironly = B_TRUE;
+                       /* overwrite "-r" option */
+                       zpc.zpc_recursive = B_FALSE;
+                       break;
+               case 'k':
+                       zpc.zpc_keep_projid = B_TRUE;
+                       break;
+               case 'p': {
+                       char *endptr;
+
+                       errno = 0;
+                       zpc.zpc_expected_projid = strtoull(optarg, &endptr, 0);
+                       if (errno != 0 || *endptr != '\0') {
+                               (void) fprintf(stderr,
+                                   gettext("project ID must be less than "
+                                   "%u\n"), UINT32_MAX);
+                               usage(B_FALSE);
+                       }
+                       if (zpc.zpc_expected_projid >= UINT32_MAX) {
+                               (void) fprintf(stderr,
+                                   gettext("invalid project ID\n"));
+                               usage(B_FALSE);
+                       }
+                       break;
+               }
+               case 'r':
+                       zpc.zpc_recursive = B_TRUE;
+                       /* overwrite "-d" option */
+                       zpc.zpc_dironly = B_FALSE;
+                       break;
+               case 's':
+                       if (zpc.zpc_op != ZFS_PROJECT_OP_DEFAULT) {
+                               (void) fprintf(stderr, gettext("cannot "
+                                   "specify '-C' '-c' '-s' together\n"));
+                               usage(B_FALSE);
+                       }
+
+                       zpc.zpc_set_flag = B_TRUE;
+                       zpc.zpc_op = ZFS_PROJECT_OP_SET;
+                       break;
+               default:
+                       (void) fprintf(stderr, gettext("invalid option '%c'\n"),
+                           optopt);
+                       usage(B_FALSE);
+               }
+       }
+
+       if (zpc.zpc_op == ZFS_PROJECT_OP_DEFAULT) {
+               if (zpc.zpc_expected_projid != ZFS_INVALID_PROJID)
+                       zpc.zpc_op = ZFS_PROJECT_OP_SET;
+               else
+                       zpc.zpc_op = ZFS_PROJECT_OP_LIST;
+       }
+
+       switch (zpc.zpc_op) {
+       case ZFS_PROJECT_OP_LIST:
+               if (zpc.zpc_keep_projid) {
+                       (void) fprintf(stderr,
+                           gettext("'-k' is only valid together with '-C'\n"));
+                       usage(B_FALSE);
+               }
+               if (!zpc.zpc_newline) {
+                       (void) fprintf(stderr,
+                           gettext("'-0' is only valid together with '-c'\n"));
+                       usage(B_FALSE);
+               }
+               break;
+       case ZFS_PROJECT_OP_CHECK:
+               if (zpc.zpc_keep_projid) {
+                       (void) fprintf(stderr,
+                           gettext("'-k' is only valid together with '-C'\n"));
+                       usage(B_FALSE);
+               }
+               break;
+       case ZFS_PROJECT_OP_CLEAR:
+               if (zpc.zpc_dironly) {
+                       (void) fprintf(stderr,
+                           gettext("'-d' is useless together with '-C'\n"));
+                       usage(B_FALSE);
+               }
+               if (!zpc.zpc_newline) {
+                       (void) fprintf(stderr,
+                           gettext("'-0' is only valid together with '-c'\n"));
+                       usage(B_FALSE);
+               }
+               if (zpc.zpc_expected_projid != ZFS_INVALID_PROJID) {
+                       (void) fprintf(stderr,
+                           gettext("'-p' is useless together with '-C'\n"));
+                       usage(B_FALSE);
+               }
+               break;
+       case ZFS_PROJECT_OP_SET:
+               if (zpc.zpc_dironly) {
+                       (void) fprintf(stderr,
+                           gettext("'-d' is useless for set project ID and/or "
+                           "inherit flag\n"));
+                       usage(B_FALSE);
+               }
+               if (zpc.zpc_keep_projid) {
+                       (void) fprintf(stderr,
+                           gettext("'-k' is only valid together with '-C'\n"));
+                       usage(B_FALSE);
+               }
+               if (!zpc.zpc_newline) {
+                       (void) fprintf(stderr,
+                           gettext("'-0' is only valid together with '-c'\n"));
+                       usage(B_FALSE);
+               }
+               break;
+       default:
+               ASSERT(0);
+               break;
+       }
+
+       argv += optind;
+       argc -= optind;
+       if (argc == 0) {
+               (void) fprintf(stderr,
+                   gettext("missing file or directory target(s)\n"));
+               usage(B_FALSE);
+       }
+
+       for (int i = 0; i < argc; i++) {
+               int err;
+
+               err = zfs_project_handle(argv[i], &zpc);
+               if (err && !ret)
+                       ret = err;
+       }
+
+       return (ret);
+}
+
+int
+main(int argc, char **argv)
+{
+       int ret = 0;
+       int i = 0;
+       char *cmdname;
+
+       (void) setlocale(LC_ALL, "");
+       (void) textdomain(TEXT_DOMAIN);
 
        opterr = 0;