Update core ZFS code from build 121 to build 141.
[zfs.git] / lib / libzfs / libzfs_sendrecv.c
index 1ffb629..672e004 100644 (file)
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
-#include <libdevinfo.h>
 #include <libintl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <fcntl.h>
 #include <sys/mount.h>
-#include <sys/mntent.h>
-#include <sys/mnttab.h>
-#include <sys/avl.h>
-#include <stddef.h>
+#include <pthread.h>
+#include <umem.h>
 
 #include <libzfs.h>
 
 #include "zfs_namecheck.h"
 #include "zfs_prop.h"
+#include "zfs_fletcher.h"
 #include "libzfs_impl.h"
+#include <sha2.h>
+#include <sys/zio_checksum.h>
+#include <sys/ddt.h>
 
-#include <fletcher.c> /* XXX */
+/* in libzfs_dataset.c */
+extern void zfs_setprop_error(libzfs_handle_t *, zfs_prop_t, int, char *);
 
 static int zfs_receive_impl(libzfs_handle_t *, const char *, recvflags_t,
-    int, avl_tree_t *, char **);
+    int, const char *, nvlist_t *, avl_tree_t *, char **);
+
+static const zio_cksum_t zero_cksum = { 0 };
+
+typedef struct dedup_arg {
+       int     inputfd;
+       int     outputfd;
+       libzfs_handle_t  *dedup_hdl;
+} dedup_arg_t;
+
+typedef struct dataref {
+       uint64_t ref_guid;
+       uint64_t ref_object;
+       uint64_t ref_offset;
+} dataref_t;
+
+typedef struct dedup_entry {
+       struct dedup_entry      *dde_next;
+       zio_cksum_t dde_chksum;
+       uint64_t dde_prop;
+       dataref_t dde_ref;
+} dedup_entry_t;
+
+#define        MAX_DDT_PHYSMEM_PERCENT         20
+#define        SMALLEST_POSSIBLE_MAX_DDT_MB            128
+
+typedef struct dedup_table {
+       dedup_entry_t   **dedup_hash_array;
+       umem_cache_t    *ddecache;
+       uint64_t        max_ddt_size;  /* max dedup table size in bytes */
+       uint64_t        cur_ddt_size;  /* current dedup table size in bytes */
+       uint64_t        ddt_count;
+       int             numhashbits;
+       boolean_t       ddt_full;
+} dedup_table_t;
+
+static int
+high_order_bit(uint64_t n)
+{
+       int count;
+
+       for (count = 0; n != 0; count++)
+               n >>= 1;
+       return (count);
+}
+
+static size_t
+ssread(void *buf, size_t len, FILE *stream)
+{
+       size_t outlen;
+
+       if ((outlen = fread(buf, len, 1, stream)) == 0)
+               return (0);
+
+       return (outlen);
+}
+
+static void
+ddt_hash_append(libzfs_handle_t *hdl, dedup_table_t *ddt, dedup_entry_t **ddepp,
+    zio_cksum_t *cs, uint64_t prop, dataref_t *dr)
+{
+       dedup_entry_t   *dde;
+
+       if (ddt->cur_ddt_size >= ddt->max_ddt_size) {
+               if (ddt->ddt_full == B_FALSE) {
+                       zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+                           "Dedup table full.  Deduplication will continue "
+                           "with existing table entries"));
+                       ddt->ddt_full = B_TRUE;
+               }
+               return;
+       }
+
+       if ((dde = umem_cache_alloc(ddt->ddecache, UMEM_DEFAULT))
+           != NULL) {
+               assert(*ddepp == NULL);
+               dde->dde_next = NULL;
+               dde->dde_chksum = *cs;
+               dde->dde_prop = prop;
+               dde->dde_ref = *dr;
+               *ddepp = dde;
+               ddt->cur_ddt_size += sizeof (dedup_entry_t);
+               ddt->ddt_count++;
+       }
+}
+
+/*
+ * Using the specified dedup table, do a lookup for an entry with
+ * the checksum cs.  If found, return the block's reference info
+ * in *dr. Otherwise, insert a new entry in the dedup table, using
+ * the reference information specified by *dr.
+ *
+ * return value:  true - entry was found
+ *               false - entry was not found
+ */
+static boolean_t
+ddt_update(libzfs_handle_t *hdl, dedup_table_t *ddt, zio_cksum_t *cs,
+    uint64_t prop, dataref_t *dr)
+{
+       uint32_t hashcode;
+       dedup_entry_t **ddepp;
+
+       hashcode = BF64_GET(cs->zc_word[0], 0, ddt->numhashbits);
+
+       for (ddepp = &(ddt->dedup_hash_array[hashcode]); *ddepp != NULL;
+           ddepp = &((*ddepp)->dde_next)) {
+               if (ZIO_CHECKSUM_EQUAL(((*ddepp)->dde_chksum), *cs) &&
+                   (*ddepp)->dde_prop == prop) {
+                       *dr = (*ddepp)->dde_ref;
+                       return (B_TRUE);
+               }
+       }
+       ddt_hash_append(hdl, ddt, ddepp, cs, prop, dr);
+       return (B_FALSE);
+}
+
+static int
+cksum_and_write(const void *buf, uint64_t len, zio_cksum_t *zc, int outfd)
+{
+       fletcher_4_incremental_native(buf, len, zc);
+       return (write(outfd, buf, len));
+}
+
+/*
+ * This function is started in a separate thread when the dedup option
+ * has been requested.  The main send thread determines the list of
+ * snapshots to be included in the send stream and makes the ioctl calls
+ * for each one.  But instead of having the ioctl send the output to the
+ * the output fd specified by the caller of zfs_send()), the
+ * ioctl is told to direct the output to a pipe, which is read by the
+ * alternate thread running THIS function.  This function does the
+ * dedup'ing by:
+ *  1. building a dedup table (the DDT)
+ *  2. doing checksums on each data block and inserting a record in the DDT
+ *  3. looking for matching checksums, and
+ *  4.  sending a DRR_WRITE_BYREF record instead of a write record whenever
+ *      a duplicate block is found.
+ * The output of this function then goes to the output fd requested
+ * by the caller of zfs_send().
+ */
+static void *
+cksummer(void *arg)
+{
+       dedup_arg_t *dda = arg;
+       char *buf = malloc(1<<20);
+       dmu_replay_record_t thedrr;
+       dmu_replay_record_t *drr = &thedrr;
+       struct drr_begin *drrb = &thedrr.drr_u.drr_begin;
+       struct drr_end *drre = &thedrr.drr_u.drr_end;
+       struct drr_object *drro = &thedrr.drr_u.drr_object;
+       struct drr_write *drrw = &thedrr.drr_u.drr_write;
+       struct drr_spill *drrs = &thedrr.drr_u.drr_spill;
+       FILE *ofp;
+       int outfd;
+       dmu_replay_record_t wbr_drr = {0};
+       struct drr_write_byref *wbr_drrr = &wbr_drr.drr_u.drr_write_byref;
+       dedup_table_t ddt;
+       zio_cksum_t stream_cksum;
+       uint64_t physmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE);
+       uint64_t numbuckets;
+
+       ddt.max_ddt_size =
+           MAX((physmem * MAX_DDT_PHYSMEM_PERCENT)/100,
+           SMALLEST_POSSIBLE_MAX_DDT_MB<<20);
+
+       numbuckets = ddt.max_ddt_size/(sizeof (dedup_entry_t));
+
+       /*
+        * numbuckets must be a power of 2.  Increase number to
+        * a power of 2 if necessary.
+        */
+       if (!ISP2(numbuckets))
+               numbuckets = 1 << high_order_bit(numbuckets);
+
+       ddt.dedup_hash_array = calloc(numbuckets, sizeof (dedup_entry_t *));
+       ddt.ddecache = umem_cache_create("dde", sizeof (dedup_entry_t), 0,
+           NULL, NULL, NULL, NULL, NULL, 0);
+       ddt.cur_ddt_size = numbuckets * sizeof (dedup_entry_t *);
+       ddt.numhashbits = high_order_bit(numbuckets) - 1;
+       ddt.ddt_full = B_FALSE;
+
+       /* Initialize the write-by-reference block. */
+       wbr_drr.drr_type = DRR_WRITE_BYREF;
+       wbr_drr.drr_payloadlen = 0;
+
+       outfd = dda->outputfd;
+       ofp = fdopen(dda->inputfd, "r");
+       while (ssread(drr, sizeof (dmu_replay_record_t), ofp) != 0) {
+
+               switch (drr->drr_type) {
+               case DRR_BEGIN:
+               {
+                       int     fflags;
+                       ZIO_SET_CHECKSUM(&stream_cksum, 0, 0, 0, 0);
+
+                       /* set the DEDUP feature flag for this stream */
+                       fflags = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo);
+                       fflags |= (DMU_BACKUP_FEATURE_DEDUP |
+                           DMU_BACKUP_FEATURE_DEDUPPROPS);
+                       DMU_SET_FEATUREFLAGS(drrb->drr_versioninfo, fflags);
+
+                       if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
+                           &stream_cksum, outfd) == -1)
+                               goto out;
+                       if (DMU_GET_STREAM_HDRTYPE(drrb->drr_versioninfo) ==
+                           DMU_COMPOUNDSTREAM && drr->drr_payloadlen != 0) {
+                               int sz = drr->drr_payloadlen;
+
+                               if (sz > 1<<20) {
+                                       free(buf);
+                                       buf = malloc(sz);
+                               }
+                               (void) ssread(buf, sz, ofp);
+                               if (ferror(stdin))
+                                       perror("fread");
+                               if (cksum_and_write(buf, sz, &stream_cksum,
+                                   outfd) == -1)
+                                       goto out;
+                       }
+                       break;
+               }
+
+               case DRR_END:
+               {
+                       /* use the recalculated checksum */
+                       ZIO_SET_CHECKSUM(&drre->drr_checksum,
+                           stream_cksum.zc_word[0], stream_cksum.zc_word[1],
+                           stream_cksum.zc_word[2], stream_cksum.zc_word[3]);
+                       if ((write(outfd, drr,
+                           sizeof (dmu_replay_record_t))) == -1)
+                               goto out;
+                       break;
+               }
+
+               case DRR_OBJECT:
+               {
+                       if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
+                           &stream_cksum, outfd) == -1)
+                               goto out;
+                       if (drro->drr_bonuslen > 0) {
+                               (void) ssread(buf,
+                                   P2ROUNDUP((uint64_t)drro->drr_bonuslen, 8),
+                                   ofp);
+                               if (cksum_and_write(buf,
+                                   P2ROUNDUP((uint64_t)drro->drr_bonuslen, 8),
+                                   &stream_cksum, outfd) == -1)
+                                       goto out;
+                       }
+                       break;
+               }
+
+               case DRR_SPILL:
+               {
+                       if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
+                           &stream_cksum, outfd) == -1)
+                               goto out;
+                       (void) ssread(buf, drrs->drr_length, ofp);
+                       if (cksum_and_write(buf, drrs->drr_length,
+                           &stream_cksum, outfd) == -1)
+                               goto out;
+                       break;
+               }
+
+               case DRR_FREEOBJECTS:
+               {
+                       if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
+                           &stream_cksum, outfd) == -1)
+                               goto out;
+                       break;
+               }
+
+               case DRR_WRITE:
+               {
+                       dataref_t       dataref;
+
+                       (void) ssread(buf, drrw->drr_length, ofp);
+
+                       /*
+                        * Use the existing checksum if it's dedup-capable,
+                        * else calculate a SHA256 checksum for it.
+                        */
+
+                       if (ZIO_CHECKSUM_EQUAL(drrw->drr_key.ddk_cksum,
+                           zero_cksum) ||
+                           !DRR_IS_DEDUP_CAPABLE(drrw->drr_checksumflags)) {
+                               SHA256_CTX      ctx;
+                               zio_cksum_t     tmpsha256;
+
+                               SHA256Init(&ctx);
+                               SHA256Update(&ctx, buf, drrw->drr_length);
+                               SHA256Final(&tmpsha256, &ctx);
+                               drrw->drr_key.ddk_cksum.zc_word[0] =
+                                   BE_64(tmpsha256.zc_word[0]);
+                               drrw->drr_key.ddk_cksum.zc_word[1] =
+                                   BE_64(tmpsha256.zc_word[1]);
+                               drrw->drr_key.ddk_cksum.zc_word[2] =
+                                   BE_64(tmpsha256.zc_word[2]);
+                               drrw->drr_key.ddk_cksum.zc_word[3] =
+                                   BE_64(tmpsha256.zc_word[3]);
+                               drrw->drr_checksumtype = ZIO_CHECKSUM_SHA256;
+                               drrw->drr_checksumflags = DRR_CHECKSUM_DEDUP;
+                       }
+
+                       dataref.ref_guid = drrw->drr_toguid;
+                       dataref.ref_object = drrw->drr_object;
+                       dataref.ref_offset = drrw->drr_offset;
+
+                       if (ddt_update(dda->dedup_hdl, &ddt,
+                           &drrw->drr_key.ddk_cksum, drrw->drr_key.ddk_prop,
+                           &dataref)) {
+                               /* block already present in stream */
+                               wbr_drrr->drr_object = drrw->drr_object;
+                               wbr_drrr->drr_offset = drrw->drr_offset;
+                               wbr_drrr->drr_length = drrw->drr_length;
+                               wbr_drrr->drr_toguid = drrw->drr_toguid;
+                               wbr_drrr->drr_refguid = dataref.ref_guid;
+                               wbr_drrr->drr_refobject =
+                                   dataref.ref_object;
+                               wbr_drrr->drr_refoffset =
+                                   dataref.ref_offset;
+
+                               wbr_drrr->drr_checksumtype =
+                                   drrw->drr_checksumtype;
+                               wbr_drrr->drr_checksumflags =
+                                   drrw->drr_checksumtype;
+                               wbr_drrr->drr_key.ddk_cksum =
+                                   drrw->drr_key.ddk_cksum;
+                               wbr_drrr->drr_key.ddk_prop =
+                                   drrw->drr_key.ddk_prop;
+
+                               if (cksum_and_write(&wbr_drr,
+                                   sizeof (dmu_replay_record_t), &stream_cksum,
+                                   outfd) == -1)
+                                       goto out;
+                       } else {
+                               /* block not previously seen */
+                               if (cksum_and_write(drr,
+                                   sizeof (dmu_replay_record_t), &stream_cksum,
+                                   outfd) == -1)
+                                       goto out;
+                               if (cksum_and_write(buf,
+                                   drrw->drr_length,
+                                   &stream_cksum, outfd) == -1)
+                                       goto out;
+                       }
+                       break;
+               }
+
+               case DRR_FREE:
+               {
+                       if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
+                           &stream_cksum, outfd) == -1)
+                               goto out;
+                       break;
+               }
+
+               default:
+                       (void) printf("INVALID record type 0x%x\n",
+                           drr->drr_type);
+                       /* should never happen, so assert */
+                       assert(B_FALSE);
+               }
+       }
+out:
+       umem_cache_destroy(ddt.ddecache);
+       free(ddt.dedup_hash_array);
+       free(buf);
+       (void) fclose(ofp);
+
+       return (NULL);
+}
 
 /*
  * Routines for dealing with the AVL tree of fs-nvlists
@@ -173,6 +544,7 @@ typedef struct send_data {
        nvlist_t *snapprops;
        const char *fromsnap;
        const char *tosnap;
+       boolean_t recursive;
 
        /*
         * The header nvlist is of the following format:
@@ -240,27 +612,50 @@ send_iterate_prop(zfs_handle_t *zhp, nvlist_t *nv)
                zfs_prop_t prop = zfs_name_to_prop(propname);
                nvlist_t *propnv;
 
-               assert(zfs_prop_user(propname) || prop != ZPROP_INVAL);
+               if (!zfs_prop_user(propname)) {
+                       /*
+                        * Realistically, this should never happen.  However,
+                        * we want the ability to add DSL properties without
+                        * needing to make incompatible version changes.  We
+                        * need to ignore unknown properties to allow older
+                        * software to still send datasets containing these
+                        * properties, with the unknown properties elided.
+                        */
+                       if (prop == ZPROP_INVAL)
+                               continue;
 
-               if (!zfs_prop_user(propname) && zfs_prop_readonly(prop))
-                       continue;
+                       if (zfs_prop_readonly(prop))
+                               continue;
+               }
 
                verify(nvpair_value_nvlist(elem, &propnv) == 0);
                if (prop == ZFS_PROP_QUOTA || prop == ZFS_PROP_RESERVATION ||
                    prop == ZFS_PROP_REFQUOTA ||
                    prop == ZFS_PROP_REFRESERVATION) {
-                       /* these guys are modifyable, but have no source */
+                       char *source;
                        uint64_t value;
                        verify(nvlist_lookup_uint64(propnv,
                            ZPROP_VALUE, &value) == 0);
                        if (zhp->zfs_type == ZFS_TYPE_SNAPSHOT)
                                continue;
+                       /*
+                        * May have no source before SPA_VERSION_RECVD_PROPS,
+                        * but is still modifiable.
+                        */
+                       if (nvlist_lookup_string(propnv,
+                           ZPROP_SOURCE, &source) == 0) {
+                               if ((strcmp(source, zhp->zfs_name) != 0) &&
+                                   (strcmp(source,
+                                   ZPROP_SOURCE_VAL_RECVD) != 0))
+                                       continue;
+                       }
                } else {
                        char *source;
                        if (nvlist_lookup_string(propnv,
                            ZPROP_SOURCE, &source) != 0)
                                continue;
-                       if (strcmp(source, zhp->zfs_name) != 0)
+                       if ((strcmp(source, zhp->zfs_name) != 0) &&
+                           (strcmp(source, ZPROP_SOURCE_VAL_RECVD) != 0))
                                continue;
                }
 
@@ -289,7 +684,7 @@ send_iterate_fs(zfs_handle_t *zhp, void *arg)
 {
        send_data_t *sd = arg;
        nvlist_t *nvfs, *nv;
-       int rv;
+       int rv = 0;
        uint64_t parent_fromsnap_guid_save = sd->parent_fromsnap_guid;
        uint64_t guid = zhp->zfs_dmustats.dds_guid;
        char guidstring[64];
@@ -331,7 +726,8 @@ send_iterate_fs(zfs_handle_t *zhp, void *arg)
        nvlist_free(nvfs);
 
        /* iterate over children */
-       rv = zfs_iter_filesystems(zhp, send_iterate_fs, sd);
+       if (sd->recursive)
+               rv = zfs_iter_filesystems(zhp, send_iterate_fs, sd);
 
        sd->parent_fromsnap_guid = parent_fromsnap_guid_save;
 
@@ -341,7 +737,7 @@ send_iterate_fs(zfs_handle_t *zhp, void *arg)
 
 static int
 gather_nvlist(libzfs_handle_t *hdl, const char *fsname, const char *fromsnap,
-    const char *tosnap, nvlist_t **nvlp, avl_tree_t **avlp)
+    const char *tosnap, boolean_t recursive, nvlist_t **nvlp, avl_tree_t **avlp)
 {
        zfs_handle_t *zhp;
        send_data_t sd = { 0 };
@@ -354,6 +750,7 @@ gather_nvlist(libzfs_handle_t *hdl, const char *fsname, const char *fromsnap,
        VERIFY(0 == nvlist_alloc(&sd.fss, NV_UNIQUE_NAME, 0));
        sd.fromsnap = fromsnap;
        sd.tosnap = tosnap;
+       sd.recursive = recursive;
 
        if ((error = send_iterate_fs(zhp, &sd)) != 0) {
                nvlist_free(sd.fss);
@@ -415,7 +812,7 @@ zfs_snapshot_compare(const void *larg, const void *rarg)
                return (0);
 }
 
-static int
+int
 zfs_iter_snapshots_sorted(zfs_handle_t *zhp, zfs_iter_f callback, void *data)
 {
        int ret = 0;
@@ -446,13 +843,16 @@ typedef struct send_dump_data {
        /* these are all just the short snapname (the part after the @) */
        const char *fromsnap;
        const char *tosnap;
-       char lastsnap[ZFS_MAXNAMELEN];
+       char prevsnap[ZFS_MAXNAMELEN];
        boolean_t seenfrom, seento, replicate, doall, fromorigin;
        boolean_t verbose;
        int outfd;
        boolean_t err;
        nvlist_t *fss;
        avl_tree_t *fsavl;
+       snapfilter_cb_t *filter_cb;
+       void *filter_cb_arg;
+       nvlist_t *debugnv;
 } send_dump_data_t;
 
 /*
@@ -461,10 +861,11 @@ typedef struct send_dump_data {
  */
 static int
 dump_ioctl(zfs_handle_t *zhp, const char *fromsnap, boolean_t fromorigin,
-    int outfd)
+    int outfd, boolean_t enoent_ok, boolean_t *got_enoent, nvlist_t *debugnv)
 {
        zfs_cmd_t zc = { 0 };
        libzfs_handle_t *hdl = zhp->zfs_hdl;
+       nvlist_t *thisdbg;
 
        assert(zhp->zfs_type == ZFS_TYPE_SNAPSHOT);
        assert(fromsnap == NULL || fromsnap[0] == '\0' || !fromorigin);
@@ -475,11 +876,26 @@ dump_ioctl(zfs_handle_t *zhp, const char *fromsnap, boolean_t fromorigin,
        zc.zc_cookie = outfd;
        zc.zc_obj = fromorigin;
 
+       *got_enoent = B_FALSE;
+
+       VERIFY(0 == nvlist_alloc(&thisdbg, NV_UNIQUE_NAME, 0));
+       if (fromsnap && fromsnap[0] != '\0') {
+               VERIFY(0 == nvlist_add_string(thisdbg,
+                   "fromsnap", fromsnap));
+       }
+
        if (ioctl(zhp->zfs_hdl->libzfs_fd, ZFS_IOC_SEND, &zc) != 0) {
                char errbuf[1024];
                (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
                    "warning: cannot send '%s'"), zhp->zfs_name);
 
+               VERIFY(0 == nvlist_add_uint64(thisdbg, "error", errno));
+               if (debugnv) {
+                       VERIFY(0 == nvlist_add_nvlist(debugnv,
+                           zhp->zfs_name, thisdbg));
+               }
+               nvlist_free(thisdbg);
+
                switch (errno) {
 
                case EXDEV:
@@ -488,6 +904,10 @@ dump_ioctl(zfs_handle_t *zhp, const char *fromsnap, boolean_t fromorigin,
                        return (zfs_error(hdl, EZFS_CROSSTARGET, errbuf));
 
                case ENOENT:
+                       if (enoent_ok) {
+                               *got_enoent = B_TRUE;
+                               return (0);
+                       }
                        if (zfs_dataset_exists(hdl, zc.zc_name,
                            ZFS_TYPE_SNAPSHOT)) {
                                zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
@@ -515,6 +935,10 @@ dump_ioctl(zfs_handle_t *zhp, const char *fromsnap, boolean_t fromorigin,
                }
        }
 
+       if (debugnv)
+               VERIFY(0 == nvlist_add_nvlist(debugnv, zhp->zfs_name, thisdbg));
+       nvlist_free(thisdbg);
+
        return (0);
 }
 
@@ -524,13 +948,17 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
        send_dump_data_t *sdd = arg;
        const char *thissnap;
        int err;
+       boolean_t got_enoent;
+       boolean_t isfromsnap, istosnap;
+       boolean_t exclude = B_FALSE;
 
        thissnap = strchr(zhp->zfs_name, '@') + 1;
+       isfromsnap = (sdd->fromsnap != NULL &&
+           strcmp(sdd->fromsnap, thissnap) == 0);
 
-       if (sdd->fromsnap && !sdd->seenfrom &&
-           strcmp(sdd->fromsnap, thissnap) == 0) {
+       if (!sdd->seenfrom && isfromsnap) {
                sdd->seenfrom = B_TRUE;
-               (void) strcpy(sdd->lastsnap, thissnap);
+               (void) strcpy(sdd->prevsnap, thissnap);
                zfs_close(zhp);
                return (0);
        }
@@ -540,20 +968,63 @@ dump_snapshot(zfs_handle_t *zhp, void *arg)
                return (0);
        }
 
+       istosnap = (strcmp(sdd->tosnap, thissnap) == 0);
+       if (istosnap)
+               sdd->seento = B_TRUE;
+
+       if (!sdd->doall && !isfromsnap && !istosnap) {
+               if (sdd->replicate) {
+                       char *snapname;
+                       nvlist_t *snapprops;
+                       /*
+                        * Filter out all intermediate snapshots except origin
+                        * snapshots needed to replicate clones.
+                        */
+                       nvlist_t *nvfs = fsavl_find(sdd->fsavl,
+                           zhp->zfs_dmustats.dds_guid, &snapname);
+
+                       VERIFY(0 == nvlist_lookup_nvlist(nvfs,
+                           "snapprops", &snapprops));
+                       VERIFY(0 == nvlist_lookup_nvlist(snapprops,
+                           thissnap, &snapprops));
+                       exclude = !nvlist_exists(snapprops, "is_clone_origin");
+               } else {
+                       exclude = B_TRUE;
+               }
+       }
+
+       /*
+        * If a filter function exists, call it to determine whether
+        * this snapshot will be sent.
+        */
+       if (exclude || (sdd->filter_cb != NULL &&
+           sdd->filter_cb(zhp, sdd->filter_cb_arg) == B_FALSE)) {
+               /*
+                * This snapshot is filtered out.  Don't send it, and don't
+                * set prevsnap, so it will be as if this snapshot didn't
+                * exist, and the next accepted snapshot will be sent as
+                * an incremental from the last accepted one, or as the
+                * first (and full) snapshot in the case of a replication,
+                * non-incremental send.
+                */
+               zfs_close(zhp);
+               return (0);
+       }
+
        /* send it */
        if (sdd->verbose) {
                (void) fprintf(stderr, "sending from @%s to %s\n",
-                   sdd->lastsnap, zhp->zfs_name);
+                   sdd->prevsnap, zhp->zfs_name);
        }
 
-       err = dump_ioctl(zhp, sdd->lastsnap,
-           sdd->lastsnap[0] == '\0' && (sdd->fromorigin || sdd->replicate),
-           sdd->outfd);
+       err = dump_ioctl(zhp, sdd->prevsnap,
+           sdd->prevsnap[0] == '\0' && (sdd->fromorigin || sdd->replicate),
+           sdd->outfd, B_TRUE, &got_enoent, sdd->debugnv);
 
-       if (!sdd->seento && strcmp(sdd->tosnap, thissnap) == 0)
-               sdd->seento = B_TRUE;
-
-       (void) strcpy(sdd->lastsnap, thissnap);
+       if (got_enoent)
+               err = 0;
+       else
+               (void) strcpy(sdd->prevsnap, thissnap);
        zfs_close(zhp);
        return (err);
 }
@@ -592,51 +1063,32 @@ dump_filesystem(zfs_handle_t *zhp, void *arg)
                }
        }
 
-       if (sdd->doall) {
-               sdd->seenfrom = sdd->seento = sdd->lastsnap[0] = 0;
-               if (sdd->fromsnap == NULL || missingfrom)
-                       sdd->seenfrom = B_TRUE;
+       sdd->seenfrom = sdd->seento = sdd->prevsnap[0] = 0;
+       if (sdd->fromsnap == NULL || missingfrom)
+               sdd->seenfrom = B_TRUE;
 
-               rv = zfs_iter_snapshots_sorted(zhp, dump_snapshot, arg);
-               if (!sdd->seenfrom) {
+       rv = zfs_iter_snapshots_sorted(zhp, dump_snapshot, arg);
+       if (!sdd->seenfrom) {
+               (void) fprintf(stderr,
+                   "WARNING: could not send %s@%s:\n"
+                   "incremental source (%s@%s) does not exist\n",
+                   zhp->zfs_name, sdd->tosnap,
+                   zhp->zfs_name, sdd->fromsnap);
+               sdd->err = B_TRUE;
+       } else if (!sdd->seento) {
+               if (sdd->fromsnap) {
                        (void) fprintf(stderr,
                            "WARNING: could not send %s@%s:\n"
-                           "incremental source (%s@%s) does not exist\n",
+                           "incremental source (%s@%s) "
+                           "is not earlier than it\n",
                            zhp->zfs_name, sdd->tosnap,
                            zhp->zfs_name, sdd->fromsnap);
-                       sdd->err = B_TRUE;
-               } else if (!sdd->seento) {
-                       if (sdd->fromsnap) {
-                               (void) fprintf(stderr,
-                                   "WARNING: could not send %s@%s:\n"
-                                   "incremental source (%s@%s) "
-                                   "is not earlier than it\n",
-                                   zhp->zfs_name, sdd->tosnap,
-                                   zhp->zfs_name, sdd->fromsnap);
-                       } else {
-                               (void) fprintf(stderr, "WARNING: "
-                                   "could not send %s@%s: does not exist\n",
-                                   zhp->zfs_name, sdd->tosnap);
-                       }
-                       sdd->err = B_TRUE;
-               }
-       } else {
-               zfs_handle_t *snapzhp;
-               char snapname[ZFS_MAXNAMELEN];
-
-               (void) snprintf(snapname, sizeof (snapname), "%s@%s",
-                   zfs_get_name(zhp), sdd->tosnap);
-               snapzhp = zfs_open(zhp->zfs_hdl, snapname, ZFS_TYPE_SNAPSHOT);
-               if (snapzhp == NULL) {
-                       rv = -1;
                } else {
-                       rv = dump_ioctl(snapzhp,
-                           missingfrom ? NULL : sdd->fromsnap,
-                           sdd->fromorigin || missingfrom,
-                           sdd->outfd);
-                       sdd->seento = B_TRUE;
-                       zfs_close(snapzhp);
+                       (void) fprintf(stderr, "WARNING: "
+                           "could not send %s@%s: does not exist\n",
+                           zhp->zfs_name, sdd->tosnap);
                }
+               sdd->err = B_TRUE;
        }
 
        return (rv);
@@ -652,6 +1104,29 @@ dump_filesystems(zfs_handle_t *rzhp, void *arg)
        if (!sdd->replicate)
                return (dump_filesystem(rzhp, sdd));
 
+       /* Mark the clone origin snapshots. */
+       for (fspair = nvlist_next_nvpair(sdd->fss, NULL); fspair;
+           fspair = nvlist_next_nvpair(sdd->fss, fspair)) {
+               nvlist_t *nvfs;
+               uint64_t origin_guid = 0;
+
+               VERIFY(0 == nvpair_value_nvlist(fspair, &nvfs));
+               (void) nvlist_lookup_uint64(nvfs, "origin", &origin_guid);
+               if (origin_guid != 0) {
+                       char *snapname;
+                       nvlist_t *origin_nv = fsavl_find(sdd->fsavl,
+                           origin_guid, &snapname);
+                       if (origin_nv != NULL) {
+                               nvlist_t *snapprops;
+                               VERIFY(0 == nvlist_lookup_nvlist(origin_nv,
+                                   "snapprops", &snapprops));
+                               VERIFY(0 == nvlist_lookup_nvlist(snapprops,
+                                   snapname, &snapprops));
+                               VERIFY(0 == nvlist_add_boolean(
+                                   snapprops, "is_clone_origin"));
+                       }
+               }
+       }
 again:
        needagain = progress = B_FALSE;
        for (fspair = nvlist_next_nvpair(sdd->fss, NULL); fspair;
@@ -661,7 +1136,6 @@ again:
                zfs_handle_t *zhp;
                int err;
                uint64_t origin_guid = 0;
-               nvlist_t *origin_nv;
 
                VERIFY(nvpair_value_nvlist(fspair, &fslist) == 0);
                if (nvlist_lookup_boolean(fslist, "sent") == 0)
@@ -670,15 +1144,19 @@ again:
                VERIFY(nvlist_lookup_string(fslist, "name", &fsname) == 0);
                (void) nvlist_lookup_uint64(fslist, "origin", &origin_guid);
 
-               origin_nv = fsavl_find(sdd->fsavl, origin_guid, NULL);
-               if (origin_nv &&
-                   nvlist_lookup_boolean(origin_nv, "sent") == ENOENT) {
-                       /*
-                        * origin has not been sent yet;
-                        * skip this clone.
-                        */
-                       needagain = B_TRUE;
-                       continue;
+               if (origin_guid != 0) {
+                       nvlist_t *origin_nv = fsavl_find(sdd->fsavl,
+                           origin_guid, NULL);
+                       if (origin_nv != NULL &&
+                           nvlist_lookup_boolean(origin_nv,
+                           "sent") == ENOENT) {
+                               /*
+                                * origin has not been sent yet;
+                                * skip this clone.
+                                */
+                               needagain = B_TRUE;
+                               continue;
+                       }
                }
 
                zhp = zfs_open(rzhp->zfs_hdl, fsname, ZFS_TYPE_DATASET);
@@ -709,21 +1187,37 @@ again:
  *      is TRUE.
  *
  * The send stream is recursive (i.e. dumps a hierarchy of snapshots) and
- * uses a special header (with a version field of DMU_BACKUP_HEADER_VERSION)
+ * uses a special header (with a hdrtype field of DMU_COMPOUNDSTREAM)
  * if "replicate" is set.  If "doall" is set, dump all the intermediate
- * snapshots. The DMU_BACKUP_HEADER_VERSION header is used in the "doall"
- * case too.
+ * snapshots. The DMU_COMPOUNDSTREAM header is used in the "doall"
+ * case too. If "props" is set, send properties.
  */
 int
 zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
-    boolean_t replicate, boolean_t doall, boolean_t fromorigin,
-    boolean_t verbose, int outfd)
+    sendflags_t flags, int outfd, snapfilter_cb_t filter_func,
+    void *cb_arg, nvlist_t **debugnvp)
 {
        char errbuf[1024];
        send_dump_data_t sdd = { 0 };
        int err;
        nvlist_t *fss = NULL;
        avl_tree_t *fsavl = NULL;
+       char holdtag[128];
+       static uint64_t holdseq;
+       int spa_version;
+       boolean_t holdsnaps = B_FALSE;
+       pthread_t tid;
+       int pipefd[2];
+       dedup_arg_t dda = { 0 };
+       int featureflags = 0;
+
+       if (zhp->zfs_type == ZFS_TYPE_FILESYSTEM) {
+               uint64_t version;
+               version = zfs_prop_get_int(zhp, ZFS_PROP_VERSION);
+               if (version >= ZPL_VERSION_SA) {
+                       featureflags |= DMU_BACKUP_FEATURE_SA_SPILL;
+               }
+       }
 
        (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
            "cannot send '%s'"), zhp->zfs_name);
@@ -734,15 +1228,48 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
                return (zfs_error(zhp->zfs_hdl, EZFS_NOENT, errbuf));
        }
 
-       if (replicate || doall) {
+       if (zfs_spa_version(zhp, &spa_version) == 0 &&
+           spa_version >= SPA_VERSION_USERREFS)
+               holdsnaps = B_TRUE;
+
+       if (flags.dedup) {
+               featureflags |= (DMU_BACKUP_FEATURE_DEDUP |
+                   DMU_BACKUP_FEATURE_DEDUPPROPS);
+               if (err = pipe(pipefd)) {
+                       zfs_error_aux(zhp->zfs_hdl, strerror(errno));
+                       return (zfs_error(zhp->zfs_hdl, EZFS_PIPEFAILED,
+                           errbuf));
+               }
+               dda.outputfd = outfd;
+               dda.inputfd = pipefd[1];
+               dda.dedup_hdl = zhp->zfs_hdl;
+               if (err = pthread_create(&tid, NULL, cksummer, &dda)) {
+                       (void) close(pipefd[0]);
+                       (void) close(pipefd[1]);
+                       zfs_error_aux(zhp->zfs_hdl, strerror(errno));
+                       return (zfs_error(zhp->zfs_hdl,
+                           EZFS_THREADCREATEFAILED, errbuf));
+               }
+       }
+
+       if (flags.replicate || flags.doall || flags.props) {
                dmu_replay_record_t drr = { 0 };
                char *packbuf = NULL;
                size_t buflen = 0;
                zio_cksum_t zc = { 0 };
 
-               assert(fromsnap || doall);
+               if (holdsnaps) {
+                       (void) snprintf(holdtag, sizeof (holdtag),
+                           ".send-%d-%llu", getpid(), (u_longlong_t)holdseq);
+                       ++holdseq;
+                       err = zfs_hold_range(zhp, fromsnap, tosnap,
+                           holdtag, flags.replicate, B_TRUE, filter_func,
+                           cb_arg);
+                       if (err)
+                               goto err_out;
+               }
 
-               if (replicate) {
+               if (flags.replicate || flags.props) {
                        nvlist_t *hdrnv;
 
                        VERIFY(0 == nvlist_alloc(&hdrnv, NV_UNIQUE_NAME, 0));
@@ -751,45 +1278,65 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
                                    "fromsnap", fromsnap));
                        }
                        VERIFY(0 == nvlist_add_string(hdrnv, "tosnap", tosnap));
+                       if (!flags.replicate) {
+                               VERIFY(0 == nvlist_add_boolean(hdrnv,
+                                   "not_recursive"));
+                       }
 
                        err = gather_nvlist(zhp->zfs_hdl, zhp->zfs_name,
-                           fromsnap, tosnap, &fss, &fsavl);
-                       if (err)
-                               return (err);
+                           fromsnap, tosnap, flags.replicate, &fss, &fsavl);
+                       if (err) {
+                               if (holdsnaps) {
+                                       (void) zfs_release_range(zhp, fromsnap,
+                                           tosnap, holdtag, flags.replicate);
+                               }
+                               goto err_out;
+                       }
                        VERIFY(0 == nvlist_add_nvlist(hdrnv, "fss", fss));
                        err = nvlist_pack(hdrnv, &packbuf, &buflen,
                            NV_ENCODE_XDR, 0);
-                       nvlist_free(hdrnv);
+                       if (debugnvp)
+                               *debugnvp = hdrnv;
+                       else
+                               nvlist_free(hdrnv);
                        if (err) {
                                fsavl_destroy(fsavl);
                                nvlist_free(fss);
-                               return (zfs_standard_error(zhp->zfs_hdl,
-                                   err, errbuf));
+                               if (holdsnaps) {
+                                       (void) zfs_release_range(zhp, fromsnap,
+                                           tosnap, holdtag, flags.replicate);
+                               }
+                               goto stderr_out;
                        }
                }
 
                /* write first begin record */
                drr.drr_type = DRR_BEGIN;
                drr.drr_u.drr_begin.drr_magic = DMU_BACKUP_MAGIC;
-               drr.drr_u.drr_begin.drr_version = DMU_BACKUP_HEADER_VERSION;
+               DMU_SET_STREAM_HDRTYPE(drr.drr_u.drr_begin.drr_versioninfo,
+                   DMU_COMPOUNDSTREAM);
+               DMU_SET_FEATUREFLAGS(drr.drr_u.drr_begin.drr_versioninfo,
+                   featureflags);
                (void) snprintf(drr.drr_u.drr_begin.drr_toname,
                    sizeof (drr.drr_u.drr_begin.drr_toname),
                    "%s@%s", zhp->zfs_name, tosnap);
                drr.drr_payloadlen = buflen;
-               fletcher_4_incremental_native(&drr, sizeof (drr), &zc);
-               err = write(outfd, &drr, sizeof (drr));
+               err = cksum_and_write(&drr, sizeof (drr), &zc, outfd);
 
                /* write header nvlist */
-               if (err != -1) {
-                       fletcher_4_incremental_native(packbuf, buflen, &zc);
-                       err = write(outfd, packbuf, buflen);
+               if (err != -1 && packbuf != NULL) {
+                       err = cksum_and_write(packbuf, buflen, &zc, outfd);
                }
                free(packbuf);
                if (err == -1) {
                        fsavl_destroy(fsavl);
                        nvlist_free(fss);
-                       return (zfs_standard_error(zhp->zfs_hdl,
-                           errno, errbuf));
+                       if (holdsnaps) {
+                               (void) zfs_release_range(zhp, fromsnap, tosnap,
+                                   holdtag, flags.replicate);
+                       }
+                       err = errno;
+                       goto stderr_out;
                }
 
                /* write end record */
@@ -801,8 +1348,12 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
                        if (err == -1) {
                                fsavl_destroy(fsavl);
                                nvlist_free(fss);
-                               return (zfs_standard_error(zhp->zfs_hdl,
-                                   errno, errbuf));
+                               err = errno;
+                               if (holdsnaps) {
+                                       (void) zfs_release_range(zhp, fromsnap,
+                                           tosnap, holdtag, flags.replicate);
+                               }
+                               goto stderr_out;
                        }
                }
        }
@@ -810,18 +1361,30 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
        /* dump each stream */
        sdd.fromsnap = fromsnap;
        sdd.tosnap = tosnap;
-       sdd.outfd = outfd;
-       sdd.replicate = replicate;
-       sdd.doall = doall;
-       sdd.fromorigin = fromorigin;
+       if (flags.dedup)
+               sdd.outfd = pipefd[0];
+       else
+               sdd.outfd = outfd;
+       sdd.replicate = flags.replicate;
+       sdd.doall = flags.doall;
+       sdd.fromorigin = flags.fromorigin;
        sdd.fss = fss;
        sdd.fsavl = fsavl;
-       sdd.verbose = verbose;
+       sdd.verbose = flags.verbose;
+       sdd.filter_cb = filter_func;
+       sdd.filter_cb_arg = cb_arg;
+       if (debugnvp)
+               sdd.debugnv = *debugnvp;
        err = dump_filesystems(zhp, &sdd);
        fsavl_destroy(fsavl);
        nvlist_free(fss);
 
-       if (replicate || doall) {
+       if (flags.dedup) {
+               (void) close(pipefd[0]);
+               (void) pthread_join(tid, NULL);
+       }
+
+       if (flags.replicate || flags.doall || flags.props) {
                /*
                 * write final end record.  NB: want to do this even if
                 * there was some error, because it might not be totally
@@ -829,6 +1392,10 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
                 */
                dmu_replay_record_t drr = { 0 };
                drr.drr_type = DRR_END;
+               if (holdsnaps) {
+                       (void) zfs_release_range(zhp, fromsnap, tosnap,
+                           holdtag, flags.replicate);
+               }
                if (write(outfd, &drr, sizeof (drr)) == -1) {
                        return (zfs_standard_error(zhp->zfs_hdl,
                            errno, errbuf));
@@ -836,6 +1403,16 @@ zfs_send(zfs_handle_t *zhp, const char *fromsnap, const char *tosnap,
        }
 
        return (err || sdd.err);
+
+stderr_out:
+       err = zfs_standard_error(zhp->zfs_hdl, err, errbuf);
+err_out:
+       if (flags.dedup) {
+               (void) pthread_cancel(tid);
+               (void) pthread_join(tid, NULL);
+               (void) close(pipefd[0]);
+       }
+       return (err);
 }
 
 /*
@@ -1017,12 +1594,13 @@ recv_destroy(libzfs_handle_t *hdl, const char *name, int baselen,
        changelist_free(clp);
 
        /*
-        * Deferred destroy should always succeed. Since we can't tell
-        * if it destroyed the dataset or just marked it for deferred
-        * destroy, always do the rename just in case.
+        * Deferred destroy might destroy the snapshot or only mark it to be
+        * destroyed later, and it returns success in either case.
         */
-       if (err != 0 || defer)
+       if (err != 0 || (defer && zfs_dataset_exists(hdl, name,
+           ZFS_TYPE_SNAPSHOT))) {
                err = recv_rename(hdl, name, NULL, baselen, newname, flags);
+       }
 
        return (err);
 }
@@ -1040,6 +1618,7 @@ guid_to_name_cb(zfs_handle_t *zhp, void *arg)
 
        if (zhp->zfs_dmustats.dds_guid == gtnd->guid) {
                (void) strcpy(gtnd->name, zhp->zfs_name);
+               zfs_close(zhp);
                return (EEXIST);
        }
        err = zfs_iter_children(zhp, guid_to_name_cb, gtnd);
@@ -1130,18 +1709,22 @@ created_before(libzfs_handle_t *hdl, avl_tree_t *avl,
 
 static int
 recv_incremental_replication(libzfs_handle_t *hdl, const char *tofs,
-    recvflags_t flags, nvlist_t *stream_nv, avl_tree_t *stream_avl)
+    recvflags_t flags, nvlist_t *stream_nv, avl_tree_t *stream_avl,
+    nvlist_t *renamed)
 {
        nvlist_t *local_nv;
        avl_tree_t *local_avl;
        nvpair_t *fselem, *nextfselem;
-       char *tosnap, *fromsnap;
+       char *fromsnap;
        char newname[ZFS_MAXNAMELEN];
        int error;
-       boolean_t needagain, progress;
+       boolean_t needagain, progress, recursive;
+       char *s1, *s2;
 
        VERIFY(0 == nvlist_lookup_string(stream_nv, "fromsnap", &fromsnap));
-       VERIFY(0 == nvlist_lookup_string(stream_nv, "tosnap", &tosnap));
+
+       recursive = (nvlist_lookup_boolean(stream_nv, "not_recursive") ==
+           ENOENT);
 
        if (flags.dryrun)
                return (0);
@@ -1150,7 +1733,7 @@ again:
        needagain = progress = B_FALSE;
 
        if ((error = gather_nvlist(hdl, tofs, fromsnap, NULL,
-           &local_nv, &local_avl)) != 0)
+           recursive, &local_nv, &local_avl)) != 0)
                return (error);
 
        /*
@@ -1273,7 +1856,7 @@ again:
                            stream_snapname, &props)) {
                                zfs_cmd_t zc = { 0 };
 
-                               zc.zc_cookie = B_TRUE; /* clear current props */
+                               zc.zc_cookie = B_TRUE; /* received */
                                (void) snprintf(zc.zc_name, sizeof (zc.zc_name),
                                    "%s@%s", fsname, nvpair_name(snapelem));
                                if (zcmd_write_src_nvlist(hdl, &zc,
@@ -1321,10 +1904,13 @@ again:
                        continue;
                }
 
-               if (fromguid == 0 && flags.verbose) {
-                       (void) printf("local fs %s does not have fromsnap "
-                           "(%s in stream); must have been deleted locally; "
-                           "ignoring\n", fsname, fromsnap);
+               if (fromguid == 0) {
+                       if (flags.verbose) {
+                               (void) printf("local fs %s does not have "
+                                   "fromsnap (%s in stream); must have "
+                                   "been deleted locally; ignoring\n",
+                                   fsname, fromsnap);
+                       }
                        continue;
                }
 
@@ -1333,11 +1919,19 @@ again:
                VERIFY(0 == nvlist_lookup_uint64(stream_nvfs,
                    "parentfromsnap", &stream_parent_fromsnap_guid));
 
-               /* check for rename */
+               s1 = strrchr(fsname, '/');
+               s2 = strrchr(stream_fsname, '/');
+
+               /*
+                * Check for rename. If the exact receive path is specified, it
+                * does not count as a rename, but we still need to check the
+                * datasets beneath it.
+                */
                if ((stream_parent_fromsnap_guid != 0 &&
+                   parent_fromsnap_guid != 0 &&
                    stream_parent_fromsnap_guid != parent_fromsnap_guid) ||
-                   strcmp(strrchr(fsname, '/'),
-                   strrchr(stream_fsname, '/')) != 0) {
+                   ((flags.isprefix || strcmp(tofs, fsname) != 0) &&
+                   (s1 != NULL) && (s2 != NULL) && strcmp(s1, s2) != 0)) {
                        nvlist_t *parent;
                        char tryname[ZFS_MAXNAMELEN];
 
@@ -1365,8 +1959,16 @@ again:
                                }
                        }
 
+                       newname[0] = '\0';
+
                        error = recv_rename(hdl, fsname, tryname,
                            strlen(tofs)+1, newname, flags);
+
+                       if (renamed != NULL && newname[0] != '\0') {
+                               VERIFY(0 == nvlist_add_boolean(renamed,
+                                   newname));
+                       }
+
                        if (error)
                                needagain = B_TRUE;
                        else
@@ -1395,37 +1997,28 @@ zfs_receive_package(libzfs_handle_t *hdl, int fd, const char *destname,
        nvlist_t *stream_nv = NULL;
        avl_tree_t *stream_avl = NULL;
        char *fromsnap = NULL;
+       char *cp;
        char tofs[ZFS_MAXNAMELEN];
+       char sendfs[ZFS_MAXNAMELEN];
        char errbuf[1024];
        dmu_replay_record_t drre;
        int error;
        boolean_t anyerr = B_FALSE;
        boolean_t softerr = B_FALSE;
+       boolean_t recursive;
 
        (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
            "cannot receive"));
 
-       if (strchr(destname, '@')) {
-               zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-                   "can not specify snapshot name for multi-snapshot stream"));
-               return (zfs_error(hdl, EZFS_BADSTREAM, errbuf));
-       }
-
        assert(drr->drr_type == DRR_BEGIN);
        assert(drr->drr_u.drr_begin.drr_magic == DMU_BACKUP_MAGIC);
-       assert(drr->drr_u.drr_begin.drr_version == DMU_BACKUP_HEADER_VERSION);
+       assert(DMU_GET_STREAM_HDRTYPE(drr->drr_u.drr_begin.drr_versioninfo) ==
+           DMU_COMPOUNDSTREAM);
 
        /*
         * Read in the nvlist from the stream.
         */
        if (drr->drr_payloadlen != 0) {
-               if (!flags.isprefix) {
-                       zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-                           "must use -d to receive replication "
-                           "(send -R) stream"));
-                       return (zfs_error(hdl, EZFS_BADSTREAM, errbuf));
-               }
-
                error = recv_read_nvlist(hdl, fd, drr->drr_payloadlen,
                    &stream_nv, flags.byteswap, zc);
                if (error) {
@@ -1434,6 +2027,16 @@ zfs_receive_package(libzfs_handle_t *hdl, int fd, const char *destname,
                }
        }
 
+       recursive = (nvlist_lookup_boolean(stream_nv, "not_recursive") ==
+           ENOENT);
+
+       if (recursive && strchr(destname, '@')) {
+               zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+                   "cannot specify snapshot name for multi-snapshot stream"));
+               error = zfs_error(hdl, EZFS_BADSTREAM, errbuf);
+               goto out;
+       }
+
        /*
         * Read in the end record and verify checksum.
         */
@@ -1477,21 +2080,73 @@ zfs_receive_package(libzfs_handle_t *hdl, int fd, const char *destname,
                }
 
                if (fromsnap != NULL) {
+                       nvlist_t *renamed = NULL;
+                       nvpair_t *pair = NULL;
+
                        (void) strlcpy(tofs, destname, ZFS_MAXNAMELEN);
                        if (flags.isprefix) {
-                               int i = strcspn(drr->drr_u.drr_begin.drr_toname,
-                                   "/@");
+                               struct drr_begin *drrb = &drr->drr_u.drr_begin;
+                               int i;
+
+                               if (flags.istail) {
+                                       cp = strrchr(drrb->drr_toname, '/');
+                                       if (cp == NULL) {
+                                               (void) strlcat(tofs, "/",
+                                                   ZFS_MAXNAMELEN);
+                                               i = 0;
+                                       } else {
+                                               i = (cp - drrb->drr_toname);
+                                       }
+                               } else {
+                                       i = strcspn(drrb->drr_toname, "/@");
+                               }
                                /* zfs_receive_one() will create_parents() */
-                               (void) strlcat(tofs,
-                                   &drr->drr_u.drr_begin.drr_toname[i],
+                               (void) strlcat(tofs, &drrb->drr_toname[i],
                                    ZFS_MAXNAMELEN);
                                *strchr(tofs, '@') = '\0';
                        }
-                       softerr = recv_incremental_replication(hdl, tofs,
-                           flags, stream_nv, stream_avl);
+
+                       if (recursive && !flags.dryrun && !flags.nomount) {
+                               VERIFY(0 == nvlist_alloc(&renamed,
+                                   NV_UNIQUE_NAME, 0));
+                       }
+
+                       softerr = recv_incremental_replication(hdl, tofs, flags,
+                           stream_nv, stream_avl, renamed);
+
+                       /* Unmount renamed filesystems before receiving. */
+                       while ((pair = nvlist_next_nvpair(renamed,
+                           pair)) != NULL) {
+                               zfs_handle_t *zhp;
+                               prop_changelist_t *clp = NULL;
+
+                               zhp = zfs_open(hdl, nvpair_name(pair),
+                                   ZFS_TYPE_FILESYSTEM);
+                               if (zhp != NULL) {
+                                       clp = changelist_gather(zhp,
+                                           ZFS_PROP_MOUNTPOINT, 0, 0);
+                                       zfs_close(zhp);
+                                       if (clp != NULL) {
+                                               softerr |=
+                                                   changelist_prefix(clp);
+                                               changelist_free(clp);
+                                       }
+                               }
+                       }
+
+                       nvlist_free(renamed);
                }
        }
 
+       /*
+        * Get the fs specified by the first path in the stream (the top level
+        * specified by 'zfs send') and pass it to each invocation of
+        * zfs_receive_one().
+        */
+       (void) strlcpy(sendfs, drr->drr_u.drr_begin.drr_toname,
+           ZFS_MAXNAMELEN);
+       if ((cp = strchr(sendfs, '@')) != NULL)
+               *cp = '\0';
 
        /* Finally, receive each contained stream */
        do {
@@ -1503,7 +2158,7 @@ zfs_receive_package(libzfs_handle_t *hdl, int fd, const char *destname,
                 * recv_skip() and return 0).
                 */
                error = zfs_receive_impl(hdl, destname, flags, fd,
-                   stream_avl, top_zfs);
+                   sendfs, stream_nv, stream_avl, top_zfs);
                if (error == ENODATA) {
                        error = 0;
                        break;
@@ -1517,7 +2172,7 @@ zfs_receive_package(libzfs_handle_t *hdl, int fd, const char *destname,
                 * renames again.
                 */
                softerr = recv_incremental_replication(hdl, tofs, flags,
-                   stream_nv, stream_avl);
+                   stream_nv, stream_avl, NULL);
        }
 
 out:
@@ -1531,11 +2186,28 @@ out:
        return (error);
 }
 
+static void
+trunc_prop_errs(int truncated)
+{
+       ASSERT(truncated != 0);
+
+       if (truncated == 1)
+               (void) fprintf(stderr, dgettext(TEXT_DOMAIN,
+                   "1 more property could not be set\n"));
+       else
+               (void) fprintf(stderr, dgettext(TEXT_DOMAIN,
+                   "%d more properties could not be set\n"), truncated);
+}
+
 static int
 recv_skip(libzfs_handle_t *hdl, int fd, boolean_t byteswap)
 {
        dmu_replay_record_t *drr;
        void *buf = malloc(1<<20);
+       char errbuf[1024];
+
+       (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
+           "cannot receive:"));
 
        /* XXX would be great to use lseek if possible... */
        drr = buf;
@@ -1548,7 +2220,11 @@ recv_skip(libzfs_handle_t *hdl, int fd, boolean_t byteswap)
                switch (drr->drr_type) {
                case DRR_BEGIN:
                        /* NB: not to be used on v2 stream packages */
-                       assert(drr->drr_payloadlen == 0);
+                       if (drr->drr_payloadlen != 0) {
+                               zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+                                   "invalid substream header"));
+                               return (zfs_error(hdl, EZFS_BADSTREAM, errbuf));
+                       }
                        break;
 
                case DRR_END:
@@ -1574,13 +2250,23 @@ recv_skip(libzfs_handle_t *hdl, int fd, boolean_t byteswap)
                        (void) recv_read(hdl, fd, buf,
                            drr->drr_u.drr_write.drr_length, B_FALSE, NULL);
                        break;
-
+               case DRR_SPILL:
+                       if (byteswap) {
+                               drr->drr_u.drr_write.drr_length =
+                                   BSWAP_64(drr->drr_u.drr_spill.drr_length);
+                       }
+                       (void) recv_read(hdl, fd, buf,
+                           drr->drr_u.drr_spill.drr_length, B_FALSE, NULL);
+                       break;
+               case DRR_WRITE_BYREF:
                case DRR_FREEOBJECTS:
                case DRR_FREE:
                        break;
 
                default:
-                       assert(!"invalid record type");
+                       zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+                           "invalid record type"));
+                       return (zfs_error(hdl, EZFS_BADSTREAM, errbuf));
                }
        }
 
@@ -1594,27 +2280,33 @@ recv_skip(libzfs_handle_t *hdl, int fd, boolean_t byteswap)
 static int
 zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
     recvflags_t flags, dmu_replay_record_t *drr,
-    dmu_replay_record_t *drr_noswap, avl_tree_t *stream_avl,
-    char **top_zfs)
+    dmu_replay_record_t *drr_noswap, const char *sendfs,
+    nvlist_t *stream_nv, avl_tree_t *stream_avl, char **top_zfs)
 {
        zfs_cmd_t zc = { 0 };
        time_t begin_time;
-       int ioctl_err, ioctl_errno, err, choplen;
+       int ioctl_err, ioctl_errno, err;
        char *cp;
        struct drr_begin *drrb = &drr->drr_u.drr_begin;
        char errbuf[1024];
-       char chopprefix[ZFS_MAXNAMELEN];
+       char prop_errbuf[1024];
+       const char *chopprefix;
        boolean_t newfs = B_FALSE;
        boolean_t stream_wantsnewfs;
        uint64_t parent_snapguid = 0;
        prop_changelist_t *clp = NULL;
        nvlist_t *snapprops_nvlist = NULL;
+       zprop_errflags_t prop_errflags;
+       boolean_t recursive;
 
        begin_time = time(NULL);
 
        (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
            "cannot receive"));
 
+       recursive = (nvlist_lookup_boolean(stream_nv, "not_recursive") ==
+           ENOENT);
+
        if (stream_avl != NULL) {
                char *snapname;
                nvlist_t *fs = fsavl_find(stream_avl, drrb->drr_toguid,
@@ -1645,6 +2337,8 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                        return (-1);
        }
 
+       cp = NULL;
+
        /*
         * Determine how much of the snapshot name stored in the stream
         * we are going to tack on to the name they specified on the
@@ -1653,38 +2347,77 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
         * If they specified a snapshot, chop the entire name stored in
         * the stream.
         */
-       (void) strcpy(chopprefix, drrb->drr_toname);
-       if (flags.isprefix) {
+       if (flags.istail) {
+               /*
+                * A filesystem was specified with -e. We want to tack on only
+                * the tail of the sent snapshot path.
+                */
+               if (strchr(tosnap, '@')) {
+                       zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "invalid "
+                           "argument - snapshot not allowed with -e"));
+                       return (zfs_error(hdl, EZFS_INVALIDNAME, errbuf));
+               }
+
+               chopprefix = strrchr(sendfs, '/');
+
+               if (chopprefix == NULL) {
+                       /*
+                        * The tail is the poolname, so we need to
+                        * prepend a path separator.
+                        */
+                       int len = strlen(drrb->drr_toname);
+                       cp = malloc(len + 2);
+                       cp[0] = '/';
+                       (void) strcpy(&cp[1], drrb->drr_toname);
+                       chopprefix = cp;
+               } else {
+                       chopprefix = drrb->drr_toname + (chopprefix - sendfs);
+               }
+       } else if (flags.isprefix) {
                /*
-                * They specified a fs with -d, we want to tack on
-                * everything but the pool name stored in the stream
+                * A filesystem was specified with -d. We want to tack on
+                * everything but the first element of the sent snapshot path
+                * (all but the pool name).
                 */
                if (strchr(tosnap, '@')) {
                        zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "invalid "
                            "argument - snapshot not allowed with -d"));
                        return (zfs_error(hdl, EZFS_INVALIDNAME, errbuf));
                }
-               cp = strchr(chopprefix, '/');
-               if (cp == NULL)
-                       cp = strchr(chopprefix, '@');
-               *cp = '\0';
+
+               chopprefix = strchr(drrb->drr_toname, '/');
+               if (chopprefix == NULL)
+                       chopprefix = strchr(drrb->drr_toname, '@');
        } else if (strchr(tosnap, '@') == NULL) {
                /*
-                * If they specified a filesystem without -d, we want to
-                * tack on everything after the fs specified in the
-                * first name from the stream.
+                * If a filesystem was specified without -d or -e, we want to
+                * tack on everything after the fs specified by 'zfs send'.
                 */
-               cp = strchr(chopprefix, '@');
-               *cp = '\0';
+               chopprefix = drrb->drr_toname + strlen(sendfs);
+       } else {
+               /* A snapshot was specified as an exact path (no -d or -e). */
+               if (recursive) {
+                       zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+                           "cannot specify snapshot name for multi-snapshot "
+                           "stream"));
+                       return (zfs_error(hdl, EZFS_BADSTREAM, errbuf));
+               }
+               chopprefix = drrb->drr_toname + strlen(drrb->drr_toname);
        }
-       choplen = strlen(chopprefix);
+
+       ASSERT(strstr(drrb->drr_toname, sendfs) == drrb->drr_toname);
+       ASSERT(chopprefix > drrb->drr_toname);
+       ASSERT(chopprefix <= drrb->drr_toname + strlen(drrb->drr_toname));
+       ASSERT(chopprefix[0] == '/' || chopprefix[0] == '@' ||
+           chopprefix[0] == '\0');
 
        /*
         * Determine name of destination snapshot, store in zc_value.
         */
+       (void) strcpy(zc.zc_top_ds, tosnap);
        (void) strcpy(zc.zc_value, tosnap);
-       (void) strncat(zc.zc_value, drrb->drr_toname+choplen,
-           sizeof (zc.zc_value));
+       (void) strncat(zc.zc_value, chopprefix, sizeof (zc.zc_value));
+       free(cp);
        if (!zfs_name_valid(zc.zc_value, ZFS_TYPE_SNAPSHOT)) {
                zcmd_free_nvlists(&zc);
                return (zfs_error(hdl, EZFS_INVALIDNAME, errbuf));
@@ -1742,7 +2475,14 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                (void) strcpy(zc.zc_name, zc.zc_value);
                *strchr(zc.zc_name, '@') = '\0';
 
-               if (!zfs_dataset_exists(hdl, zc.zc_name, ZFS_TYPE_DATASET)) {
+               /*
+                * If the exact receive path was specified and this is the
+                * topmost path in the stream, then if the fs does not exist we
+                * should look no further.
+                */
+               if ((flags.isprefix || (*(chopprefix = drrb->drr_toname +
+                   strlen(sendfs)) != '\0' && *chopprefix != '@')) &&
+                   !zfs_dataset_exists(hdl, zc.zc_name, ZFS_TYPE_DATASET)) {
                        char snap[ZFS_MAXNAMELEN];
                        (void) strcpy(snap, strchr(zc.zc_value, '@'));
                        if (guid_to_name(hdl, tosnap, drrb->drr_fromguid,
@@ -1758,6 +2498,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
 
        if (zfs_dataset_exists(hdl, zc.zc_name, ZFS_TYPE_DATASET)) {
                zfs_handle_t *zhp;
+
                /*
                 * Destination fs exists.  Therefore this should either
                 * be an incremental, or the stream specifies a new fs
@@ -1765,7 +2506,6 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                 * away (and have therefore specified -F and removed any
                 * snapshots).
                 */
-
                if (stream_wantsnewfs) {
                        if (!flags.force) {
                                zcmd_free_nvlists(&zc);
@@ -1819,12 +2559,6 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                                return (-1);
                        }
                }
-               if (!flags.dryrun && zhp->zfs_type == ZFS_TYPE_VOLUME &&
-                   zvol_remove_link(hdl, zhp->zfs_name) != 0) {
-                       zfs_close(zhp);
-                       zcmd_free_nvlists(&zc);
-                       return (-1);
-               }
                zfs_close(zhp);
        } else {
                /*
@@ -1848,7 +2582,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                 */
                *cp = '\0';
 
-               if (flags.isprefix && !flags.dryrun &&
+               if (flags.isprefix && !flags.istail && !flags.dryrun &&
                    create_parents(hdl, zc.zc_value, strlen(tosnap)) != 0) {
                        zcmd_free_nvlists(&zc);
                        return (zfs_error(hdl, EZFS_BADRESTORE, errbuf));
@@ -1873,21 +2607,59 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                return (recv_skip(hdl, infd, flags.byteswap));
        }
 
+       zc.zc_nvlist_dst = (uint64_t)(uintptr_t)prop_errbuf;
+       zc.zc_nvlist_dst_size = sizeof (prop_errbuf);
+
        err = ioctl_err = zfs_ioctl(hdl, ZFS_IOC_RECV, &zc);
        ioctl_errno = errno;
+       prop_errflags = (zprop_errflags_t)zc.zc_obj;
+
+       if (err == 0) {
+               nvlist_t *prop_errors;
+               VERIFY(0 == nvlist_unpack((void *)(uintptr_t)zc.zc_nvlist_dst,
+                   zc.zc_nvlist_dst_size, &prop_errors, 0));
+
+               nvpair_t *prop_err = NULL;
+
+               while ((prop_err = nvlist_next_nvpair(prop_errors,
+                   prop_err)) != NULL) {
+                       char tbuf[1024];
+                       zfs_prop_t prop;
+                       int intval;
+
+                       prop = zfs_name_to_prop(nvpair_name(prop_err));
+                       (void) nvpair_value_int32(prop_err, &intval);
+                       if (strcmp(nvpair_name(prop_err),
+                           ZPROP_N_MORE_ERRORS) == 0) {
+                               trunc_prop_errs(intval);
+                               break;
+                       } else {
+                               (void) snprintf(tbuf, sizeof (tbuf),
+                                   dgettext(TEXT_DOMAIN,
+                                   "cannot receive %s property on %s"),
+                                   nvpair_name(prop_err), zc.zc_name);
+                               zfs_setprop_error(hdl, prop, intval, tbuf);
+                       }
+               }
+               nvlist_free(prop_errors);
+       }
+
+       zc.zc_nvlist_dst = 0;
+       zc.zc_nvlist_dst_size = 0;
        zcmd_free_nvlists(&zc);
 
        if (err == 0 && snapprops_nvlist) {
                zfs_cmd_t zc2 = { 0 };
 
                (void) strcpy(zc2.zc_name, zc.zc_value);
+               zc2.zc_cookie = B_TRUE; /* received */
                if (zcmd_write_src_nvlist(hdl, &zc2, snapprops_nvlist) == 0) {
                        (void) zfs_ioctl(hdl, ZFS_IOC_SET_PROP, &zc2);
                        zcmd_free_nvlists(&zc2);
                }
        }
 
-       if (err && (ioctl_errno == ENOENT || ioctl_errno == ENODEV)) {
+       if (err && (ioctl_errno == ENOENT || ioctl_errno == EEXIST)) {
                /*
                 * It may be that this snapshot already exists,
                 * in which case we want to consume & ignore it
@@ -1895,7 +2667,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                 */
                avl_tree_t *local_avl;
                nvlist_t *local_nv, *fs;
-               char *cp = strchr(zc.zc_value, '@');
+               cp = strchr(zc.zc_value, '@');
 
                /*
                 * XXX Do this faster by just iterating over snaps in
@@ -1903,7 +2675,7 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                 * get a strange "does not exist" error message.
                 */
                *cp = '\0';
-               if (gather_nvlist(hdl, zc.zc_value, NULL, NULL,
+               if (gather_nvlist(hdl, zc.zc_value, NULL, NULL, B_FALSE,
                    &local_nv, &local_avl) == 0) {
                        *cp = '@';
                        fs = fsavl_find(local_avl, drrb->drr_toguid, NULL);
@@ -1915,14 +2687,13 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                                        (void) printf("snap %s already exists; "
                                            "ignoring\n", zc.zc_value);
                                }
-                               ioctl_err = recv_skip(hdl, infd,
+                               err = ioctl_err = recv_skip(hdl, infd,
                                    flags.byteswap);
                        }
                }
                *cp = '@';
        }
 
-
        if (ioctl_err != 0) {
                switch (ioctl_errno) {
                case ENODEV:
@@ -1961,18 +2732,25 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                            "invalid stream (checksum mismatch)"));
                        (void) zfs_error(hdl, EZFS_BADSTREAM, errbuf);
                        break;
+               case ENOTSUP:
+                       zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+                           "pool must be upgraded to receive this stream."));
+                       (void) zfs_error(hdl, EZFS_BADVERSION, errbuf);
+                       break;
+               case EDQUOT:
+                       zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+                           "destination %s space quota exceeded"), zc.zc_name);
+                       (void) zfs_error(hdl, EZFS_BADRESTORE, errbuf);
+                       break;
                default:
                        (void) zfs_standard_error(hdl, ioctl_errno, errbuf);
                }
        }
 
        /*
-        * Mount or recreate the /dev links for the target filesystem
-        * (if created, or if we tore them down to do an incremental
-        * restore), and the /dev links for the new snapshot (if
-        * created). Also mount any children of the target filesystem
-        * if we did a replication receive (indicated by stream_avl
-        * being non-NULL).
+        * Mount the target filesystem (if created).  Also mount any
+        * children of the target filesystem if we did a replication
+        * receive (indicated by stream_avl being non-NULL).
         */
        cp = strchr(zc.zc_value, '@');
        if (cp && (ioctl_err == 0 || !newfs)) {
@@ -1984,10 +2762,6 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                if (h != NULL) {
                        if (h->zfs_type == ZFS_TYPE_VOLUME) {
                                *cp = '@';
-                               err = zvol_create_link(hdl, h->zfs_name);
-                               if (err == 0 && ioctl_err == 0)
-                                       err = zvol_create_link(hdl,
-                                           zc.zc_value);
                        } else if (newfs || stream_avl) {
                                /*
                                 * Track the first/top of hierarchy fs,
@@ -2006,6 +2780,19 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
                changelist_free(clp);
        }
 
+       if (prop_errflags & ZPROP_ERR_NOCLEAR) {
+               (void) fprintf(stderr, dgettext(TEXT_DOMAIN, "Warning: "
+                   "failed to clear unreceived properties on %s"),
+                   zc.zc_name);
+               (void) fprintf(stderr, "\n");
+       }
+       if (prop_errflags & ZPROP_ERR_NORESTORE) {
+               (void) fprintf(stderr, dgettext(TEXT_DOMAIN, "Warning: "
+                   "failed to restore original properties on %s"),
+                   zc.zc_name);
+               (void) fprintf(stderr, "\n");
+       }
+
        if (err || ioctl_err)
                return (-1);
 
@@ -2028,13 +2815,16 @@ zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
 
 static int
 zfs_receive_impl(libzfs_handle_t *hdl, const char *tosnap, recvflags_t flags,
-    int infd, avl_tree_t *stream_avl, char **top_zfs)
+    int infd, const char *sendfs, nvlist_t *stream_nv, avl_tree_t *stream_avl,
+    char **top_zfs)
 {
        int err;
        dmu_replay_record_t drr, drr_noswap;
        struct drr_begin *drrb = &drr.drr_u.drr_begin;
        char errbuf[1024];
        zio_cksum_t zcksum = { 0 };
+       uint64_t featureflags;
+       int hdrtype;
 
        (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN,
            "cannot receive"));
@@ -2072,7 +2862,7 @@ zfs_receive_impl(libzfs_handle_t *hdl, const char *tosnap, recvflags_t flags,
                drr.drr_type = BSWAP_32(drr.drr_type);
                drr.drr_payloadlen = BSWAP_32(drr.drr_payloadlen);
                drrb->drr_magic = BSWAP_64(drrb->drr_magic);
-               drrb->drr_version = BSWAP_64(drrb->drr_version);
+               drrb->drr_versioninfo = BSWAP_64(drrb->drr_versioninfo);
                drrb->drr_creation_time = BSWAP_64(drrb->drr_creation_time);
                drrb->drr_type = BSWAP_32(drrb->drr_type);
                drrb->drr_flags = BSWAP_32(drrb->drr_flags);
@@ -2086,23 +2876,45 @@ zfs_receive_impl(libzfs_handle_t *hdl, const char *tosnap, recvflags_t flags,
                return (zfs_error(hdl, EZFS_BADSTREAM, errbuf));
        }
 
+       featureflags = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo);
+       hdrtype = DMU_GET_STREAM_HDRTYPE(drrb->drr_versioninfo);
+
+       if (!DMU_STREAM_SUPPORTED(featureflags) ||
+           (hdrtype != DMU_SUBSTREAM && hdrtype != DMU_COMPOUNDSTREAM)) {
+               zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+                   "stream has unsupported feature, feature flags = %lx"),
+                   featureflags);
+               return (zfs_error(hdl, EZFS_BADSTREAM, errbuf));
+       }
+
        if (strchr(drrb->drr_toname, '@') == NULL) {
                zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "invalid "
                    "stream (bad snapshot name)"));
                return (zfs_error(hdl, EZFS_BADSTREAM, errbuf));
        }
 
-       if (drrb->drr_version == DMU_BACKUP_STREAM_VERSION) {
+       if (DMU_GET_STREAM_HDRTYPE(drrb->drr_versioninfo) == DMU_SUBSTREAM) {
+               char nonpackage_sendfs[ZFS_MAXNAMELEN];
+               if (sendfs == NULL) {
+                       /*
+                        * We were not called from zfs_receive_package(). Get
+                        * the fs specified by 'zfs send'.
+                        */
+                       char *cp;
+                       (void) strlcpy(nonpackage_sendfs,
+                           drr.drr_u.drr_begin.drr_toname, ZFS_MAXNAMELEN);
+                       if ((cp = strchr(nonpackage_sendfs, '@')) != NULL)
+                               *cp = '\0';
+                       sendfs = nonpackage_sendfs;
+               }
                return (zfs_receive_one(hdl, infd, tosnap, flags,
-                   &drr, &drr_noswap, stream_avl, top_zfs));
-       } else if (drrb->drr_version == DMU_BACKUP_HEADER_VERSION) {
+                   &drr, &drr_noswap, sendfs, stream_nv, stream_avl,
+                   top_zfs));
+       } else {
+               assert(DMU_GET_STREAM_HDRTYPE(drrb->drr_versioninfo) ==
+                   DMU_COMPOUNDSTREAM);
                return (zfs_receive_package(hdl, infd, tosnap, flags,
                    &drr, &zcksum, top_zfs));
-       } else {
-               zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
-                   "stream is unsupported version %llu"),
-                   drrb->drr_version);
-               return (zfs_error(hdl, EZFS_BADSTREAM, errbuf));
        }
 }
 
@@ -2119,7 +2931,8 @@ zfs_receive(libzfs_handle_t *hdl, const char *tosnap, recvflags_t flags,
        char *top_zfs = NULL;
        int err;
 
-       err = zfs_receive_impl(hdl, tosnap, flags, infd, stream_avl, &top_zfs);
+       err = zfs_receive_impl(hdl, tosnap, flags, infd, NULL, NULL,
+           stream_avl, &top_zfs);
 
        if (err == 0 && !flags.nomount && top_zfs) {
                zfs_handle_t *zhp;