]> git.proxmox.com Git - mirror_zfs.git/blobdiff - module/zfs/dmu_send.c
Illumos 5314 - Remove "dbuf phys" db->db_data pointer aliases in ZFS
[mirror_zfs.git] / module / zfs / dmu_send.c
index 2f06132116e8da7f5c9b5f44021f77ceafc7037b..36d8111389039a2077ef6738703080dfcac89cf9 100644 (file)
@@ -22,7 +22,8 @@
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2011 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2014, Joyent, Inc. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #include <sys/dmu.h>
@@ -38,6 +39,7 @@
 #include <sys/dsl_prop.h>
 #include <sys/dsl_pool.h>
 #include <sys/dsl_synctask.h>
+#include <sys/spa_impl.h>
 #include <sys/zfs_ioctl.h>
 #include <sys/zap.h>
 #include <sys/zio_checksum.h>
 #include <sys/avl.h>
 #include <sys/ddt.h>
 #include <sys/zfs_onexit.h>
+#include <sys/dmu_send.h>
+#include <sys/dsl_destroy.h>
+#include <sys/blkptr.h>
+#include <sys/dsl_bookmark.h>
+#include <sys/zfeature.h>
 
 /* Set this tunable to TRUE to replace corrupt data with 0x2f5baddb10c */
 int zfs_send_corrupt_data = B_FALSE;
 
 static char *dmu_recv_tag = "dmu_recv_tag";
+static const char *recv_clone_name = "%recv";
 
-/*
- * The list of data whose inclusion in a send stream can be pending from
- * one call to backup_cb to another.  Multiple calls to dump_free() and
- * dump_freeobjects() can be aggregated into a single DRR_FREE or
- * DRR_FREEOBJECTS replay record.
- */
-typedef enum {
-       PENDING_NONE,
-       PENDING_FREE,
-       PENDING_FREEOBJECTS
-} pendop_t;
-
-struct backuparg {
-       dmu_replay_record_t *drr;
-       vnode_t *vp;
-       offset_t *off;
-       objset_t *os;
-       zio_cksum_t zc;
-       uint64_t toguid;
-       int err;
-       pendop_t pending_op;
-};
+typedef struct dump_bytes_io {
+       dmu_sendarg_t   *dbi_dsp;
+       void            *dbi_buf;
+       int             dbi_len;
+} dump_bytes_io_t;
 
-static int
-dump_bytes(struct backuparg *ba, void *buf, int len)
+static void
+dump_bytes_strategy(void *arg)
 {
+       dump_bytes_io_t *dbi = (dump_bytes_io_t *)arg;
+       dmu_sendarg_t *dsp = dbi->dbi_dsp;
+       dsl_dataset_t *ds = dsp->dsa_os->os_dsl_dataset;
        ssize_t resid; /* have to get resid to get detailed errno */
-       ASSERT3U(len % 8, ==, 0);
+       ASSERT0(dbi->dbi_len % 8);
 
-       fletcher_4_incremental_native(buf, len, &ba->zc);
-       ba->err = vn_rdwr(UIO_WRITE, ba->vp,
-           (caddr_t)buf, len,
+       fletcher_4_incremental_native(dbi->dbi_buf, dbi->dbi_len, &dsp->dsa_zc);
+       dsp->dsa_err = vn_rdwr(UIO_WRITE, dsp->dsa_vp,
+           (caddr_t)dbi->dbi_buf, dbi->dbi_len,
            0, UIO_SYSSPACE, FAPPEND, RLIM64_INFINITY, CRED(), &resid);
-       *ba->off += len;
-       return (ba->err);
+
+       mutex_enter(&ds->ds_sendstream_lock);
+       *dsp->dsa_off += dbi->dbi_len;
+       mutex_exit(&ds->ds_sendstream_lock);
 }
 
 static int
-dump_free(struct backuparg *ba, uint64_t object, uint64_t offset,
+dump_bytes(dmu_sendarg_t *dsp, void *buf, int len)
+{
+       dump_bytes_io_t dbi;
+
+       dbi.dbi_dsp = dsp;
+       dbi.dbi_buf = buf;
+       dbi.dbi_len = len;
+
+       /*
+        * The vn_rdwr() call is performed in a taskq to ensure that there is
+        * always enough stack space to write safely to the target filesystem.
+        * The ZIO_TYPE_FREE threads are used because there can be a lot of
+        * them and they are used in vdev_file.c for a similar purpose.
+        */
+       spa_taskq_dispatch_sync(dmu_objset_spa(dsp->dsa_os), ZIO_TYPE_FREE,
+           ZIO_TASKQ_ISSUE, dump_bytes_strategy, &dbi, TQ_SLEEP);
+
+       return (dsp->dsa_err);
+}
+
+static int
+dump_free(dmu_sendarg_t *dsp, uint64_t object, uint64_t offset,
     uint64_t length)
 {
-       struct drr_free *drrf = &(ba->drr->drr_u.drr_free);
+       struct drr_free *drrf = &(dsp->dsa_drr->drr_u.drr_free);
+
+       /*
+        * When we receive a free record, dbuf_free_range() assumes
+        * that the receiving system doesn't have any dbufs in the range
+        * being freed.  This is always true because there is a one-record
+        * constraint: we only send one WRITE record for any given
+        * object+offset.  We know that the one-record constraint is
+        * true because we always send data in increasing order by
+        * object,offset.
+        *
+        * If the increasing-order constraint ever changes, we should find
+        * another way to assert that the one-record constraint is still
+        * satisfied.
+        */
+       ASSERT(object > dsp->dsa_last_data_object ||
+           (object == dsp->dsa_last_data_object &&
+           offset > dsp->dsa_last_data_offset));
+
+       /*
+        * If we are doing a non-incremental send, then there can't
+        * be any data in the dataset we're receiving into.  Therefore
+        * a free record would simply be a no-op.  Save space by not
+        * sending it to begin with.
+        */
+       if (!dsp->dsa_incremental)
+               return (0);
+
+       if (length != -1ULL && offset + length < offset)
+               length = -1ULL;
 
        /*
         * If there is a pending op, but it's not PENDING_FREE, push it out,
@@ -102,13 +148,15 @@ dump_free(struct backuparg *ba, uint64_t object, uint64_t offset,
         * other DRR_FREE records.  DRR_FREEOBJECTS records can only be
         * aggregated with other DRR_FREEOBJECTS records.
         */
-       if (ba->pending_op != PENDING_NONE && ba->pending_op != PENDING_FREE) {
-               if (dump_bytes(ba, ba->drr, sizeof (dmu_replay_record_t)) != 0)
-                       return (EINTR);
-               ba->pending_op = PENDING_NONE;
+       if (dsp->dsa_pending_op != PENDING_NONE &&
+           dsp->dsa_pending_op != PENDING_FREE) {
+               if (dump_bytes(dsp, dsp->dsa_drr,
+                   sizeof (dmu_replay_record_t)) != 0)
+                       return (SET_ERROR(EINTR));
+               dsp->dsa_pending_op = PENDING_NONE;
        }
 
-       if (ba->pending_op == PENDING_FREE) {
+       if (dsp->dsa_pending_op == PENDING_FREE) {
                /*
                 * There should never be a PENDING_FREE if length is -1
                 * (because dump_dnode is the only place where this
@@ -126,35 +174,45 @@ dump_free(struct backuparg *ba, uint64_t object, uint64_t offset,
                        return (0);
                } else {
                        /* not a continuation.  Push out pending record */
-                       if (dump_bytes(ba, ba->drr,
+                       if (dump_bytes(dsp, dsp->dsa_drr,
                            sizeof (dmu_replay_record_t)) != 0)
-                               return (EINTR);
-                       ba->pending_op = PENDING_NONE;
+                               return (SET_ERROR(EINTR));
+                       dsp->dsa_pending_op = PENDING_NONE;
                }
        }
        /* create a FREE record and make it pending */
-       bzero(ba->drr, sizeof (dmu_replay_record_t));
-       ba->drr->drr_type = DRR_FREE;
+       bzero(dsp->dsa_drr, sizeof (dmu_replay_record_t));
+       dsp->dsa_drr->drr_type = DRR_FREE;
        drrf->drr_object = object;
        drrf->drr_offset = offset;
        drrf->drr_length = length;
-       drrf->drr_toguid = ba->toguid;
+       drrf->drr_toguid = dsp->dsa_toguid;
        if (length == -1ULL) {
-               if (dump_bytes(ba, ba->drr, sizeof (dmu_replay_record_t)) != 0)
-                       return (EINTR);
+               if (dump_bytes(dsp, dsp->dsa_drr,
+                   sizeof (dmu_replay_record_t)) != 0)
+                       return (SET_ERROR(EINTR));
        } else {
-               ba->pending_op = PENDING_FREE;
+               dsp->dsa_pending_op = PENDING_FREE;
        }
 
        return (0);
 }
 
 static int
-dump_data(struct backuparg *ba, dmu_object_type_t type,
+dump_write(dmu_sendarg_t *dsp, dmu_object_type_t type,
     uint64_t object, uint64_t offset, int blksz, const blkptr_t *bp, void *data)
 {
-       struct drr_write *drrw = &(ba->drr->drr_u.drr_write);
+       struct drr_write *drrw = &(dsp->dsa_drr->drr_u.drr_write);
 
+       /*
+        * We send data in increasing object, offset order.
+        * See comment in dump_free() for details.
+        */
+       ASSERT(object > dsp->dsa_last_data_object ||
+           (object == dsp->dsa_last_data_object &&
+           offset > dsp->dsa_last_data_offset));
+       dsp->dsa_last_data_object = object;
+       dsp->dsa_last_data_offset = offset + blksz - 1;
 
        /*
         * If there is any kind of pending aggregation (currently either
@@ -162,63 +220,115 @@ dump_data(struct backuparg *ba, dmu_object_type_t type,
         * the stream, since aggregation can't be done across operations
         * of different types.
         */
-       if (ba->pending_op != PENDING_NONE) {
-               if (dump_bytes(ba, ba->drr, sizeof (dmu_replay_record_t)) != 0)
-                       return (EINTR);
-               ba->pending_op = PENDING_NONE;
+       if (dsp->dsa_pending_op != PENDING_NONE) {
+               if (dump_bytes(dsp, dsp->dsa_drr,
+                   sizeof (dmu_replay_record_t)) != 0)
+                       return (SET_ERROR(EINTR));
+               dsp->dsa_pending_op = PENDING_NONE;
        }
        /* write a DATA record */
-       bzero(ba->drr, sizeof (dmu_replay_record_t));
-       ba->drr->drr_type = DRR_WRITE;
+       bzero(dsp->dsa_drr, sizeof (dmu_replay_record_t));
+       dsp->dsa_drr->drr_type = DRR_WRITE;
        drrw->drr_object = object;
        drrw->drr_type = type;
        drrw->drr_offset = offset;
        drrw->drr_length = blksz;
-       drrw->drr_toguid = ba->toguid;
-       drrw->drr_checksumtype = BP_GET_CHECKSUM(bp);
-       if (zio_checksum_table[drrw->drr_checksumtype].ci_dedup)
-               drrw->drr_checksumflags |= DRR_CHECKSUM_DEDUP;
-       DDK_SET_LSIZE(&drrw->drr_key, BP_GET_LSIZE(bp));
-       DDK_SET_PSIZE(&drrw->drr_key, BP_GET_PSIZE(bp));
-       DDK_SET_COMPRESS(&drrw->drr_key, BP_GET_COMPRESS(bp));
-       drrw->drr_key.ddk_cksum = bp->blk_cksum;
-
-       if (dump_bytes(ba, ba->drr, sizeof (dmu_replay_record_t)) != 0)
+       drrw->drr_toguid = dsp->dsa_toguid;
+       if (BP_IS_EMBEDDED(bp)) {
+               /*
+                * There's no pre-computed checksum of embedded BP's, so
+                * (like fletcher4-checkummed blocks) userland will have
+                * to compute a dedup-capable checksum itself.
+                */
+               drrw->drr_checksumtype = ZIO_CHECKSUM_OFF;
+       } else {
+               drrw->drr_checksumtype = BP_GET_CHECKSUM(bp);
+               if (zio_checksum_table[drrw->drr_checksumtype].ci_dedup)
+                       drrw->drr_checksumflags |= DRR_CHECKSUM_DEDUP;
+               DDK_SET_LSIZE(&drrw->drr_key, BP_GET_LSIZE(bp));
+               DDK_SET_PSIZE(&drrw->drr_key, BP_GET_PSIZE(bp));
+               DDK_SET_COMPRESS(&drrw->drr_key, BP_GET_COMPRESS(bp));
+               drrw->drr_key.ddk_cksum = bp->blk_cksum;
+       }
+
+       if (dump_bytes(dsp, dsp->dsa_drr, sizeof (dmu_replay_record_t)) != 0)
+               return (SET_ERROR(EINTR));
+       if (dump_bytes(dsp, data, blksz) != 0)
+               return (SET_ERROR(EINTR));
+       return (0);
+}
+
+static int
+dump_write_embedded(dmu_sendarg_t *dsp, uint64_t object, uint64_t offset,
+    int blksz, const blkptr_t *bp)
+{
+       char buf[BPE_PAYLOAD_SIZE];
+       struct drr_write_embedded *drrw =
+           &(dsp->dsa_drr->drr_u.drr_write_embedded);
+
+       if (dsp->dsa_pending_op != PENDING_NONE) {
+               if (dump_bytes(dsp, dsp->dsa_drr,
+                   sizeof (dmu_replay_record_t)) != 0)
+                       return (EINTR);
+               dsp->dsa_pending_op = PENDING_NONE;
+       }
+
+       ASSERT(BP_IS_EMBEDDED(bp));
+
+       bzero(dsp->dsa_drr, sizeof (dmu_replay_record_t));
+       dsp->dsa_drr->drr_type = DRR_WRITE_EMBEDDED;
+       drrw->drr_object = object;
+       drrw->drr_offset = offset;
+       drrw->drr_length = blksz;
+       drrw->drr_toguid = dsp->dsa_toguid;
+       drrw->drr_compression = BP_GET_COMPRESS(bp);
+       drrw->drr_etype = BPE_GET_ETYPE(bp);
+       drrw->drr_lsize = BPE_GET_LSIZE(bp);
+       drrw->drr_psize = BPE_GET_PSIZE(bp);
+
+       decode_embedded_bp_compressed(bp, buf);
+
+       if (dump_bytes(dsp, dsp->dsa_drr, sizeof (dmu_replay_record_t)) != 0)
                return (EINTR);
-       if (dump_bytes(ba, data, blksz) != 0)
+       if (dump_bytes(dsp, buf, P2ROUNDUP(drrw->drr_psize, 8)) != 0)
                return (EINTR);
        return (0);
 }
 
 static int
-dump_spill(struct backuparg *ba, uint64_t object, int blksz, void *data)
+dump_spill(dmu_sendarg_t *dsp, uint64_t object, int blksz, void *data)
 {
-       struct drr_spill *drrs = &(ba->drr->drr_u.drr_spill);
+       struct drr_spill *drrs = &(dsp->dsa_drr->drr_u.drr_spill);
 
-       if (ba->pending_op != PENDING_NONE) {
-               if (dump_bytes(ba, ba->drr, sizeof (dmu_replay_record_t)) != 0)
-                       return (EINTR);
-               ba->pending_op = PENDING_NONE;
+       if (dsp->dsa_pending_op != PENDING_NONE) {
+               if (dump_bytes(dsp, dsp->dsa_drr,
+                   sizeof (dmu_replay_record_t)) != 0)
+                       return (SET_ERROR(EINTR));
+               dsp->dsa_pending_op = PENDING_NONE;
        }
 
        /* write a SPILL record */
-       bzero(ba->drr, sizeof (dmu_replay_record_t));
-       ba->drr->drr_type = DRR_SPILL;
+       bzero(dsp->dsa_drr, sizeof (dmu_replay_record_t));
+       dsp->dsa_drr->drr_type = DRR_SPILL;
        drrs->drr_object = object;
        drrs->drr_length = blksz;
-       drrs->drr_toguid = ba->toguid;
+       drrs->drr_toguid = dsp->dsa_toguid;
 
-       if (dump_bytes(ba, ba->drr, sizeof (dmu_replay_record_t)))
-               return (EINTR);
-       if (dump_bytes(ba, data, blksz))
-               return (EINTR);
+       if (dump_bytes(dsp, dsp->dsa_drr, sizeof (dmu_replay_record_t)))
+               return (SET_ERROR(EINTR));
+       if (dump_bytes(dsp, data, blksz))
+               return (SET_ERROR(EINTR));
        return (0);
 }
 
 static int
-dump_freeobjects(struct backuparg *ba, uint64_t firstobj, uint64_t numobjs)
+dump_freeobjects(dmu_sendarg_t *dsp, uint64_t firstobj, uint64_t numobjs)
 {
-       struct drr_freeobjects *drrfo = &(ba->drr->drr_u.drr_freeobjects);
+       struct drr_freeobjects *drrfo = &(dsp->dsa_drr->drr_u.drr_freeobjects);
+
+       /* See comment in dump_free(). */
+       if (!dsp->dsa_incremental)
+               return (0);
 
        /*
         * If there is a pending op, but it's not PENDING_FREEOBJECTS,
@@ -227,13 +337,14 @@ dump_freeobjects(struct backuparg *ba, uint64_t firstobj, uint64_t numobjs)
         * aggregated with other DRR_FREE records.  DRR_FREEOBJECTS records
         * can only be aggregated with other DRR_FREEOBJECTS records.
         */
-       if (ba->pending_op != PENDING_NONE &&
-           ba->pending_op != PENDING_FREEOBJECTS) {
-               if (dump_bytes(ba, ba->drr, sizeof (dmu_replay_record_t)) != 0)
-                       return (EINTR);
-               ba->pending_op = PENDING_NONE;
+       if (dsp->dsa_pending_op != PENDING_NONE &&
+           dsp->dsa_pending_op != PENDING_FREEOBJECTS) {
+               if (dump_bytes(dsp, dsp->dsa_drr,
+                   sizeof (dmu_replay_record_t)) != 0)
+                       return (SET_ERROR(EINTR));
+               dsp->dsa_pending_op = PENDING_NONE;
        }
-       if (ba->pending_op == PENDING_FREEOBJECTS) {
+       if (dsp->dsa_pending_op == PENDING_FREEOBJECTS) {
                /*
                 * See whether this free object array can be aggregated
                 * with pending one
@@ -243,42 +354,43 @@ dump_freeobjects(struct backuparg *ba, uint64_t firstobj, uint64_t numobjs)
                        return (0);
                } else {
                        /* can't be aggregated.  Push out pending record */
-                       if (dump_bytes(ba, ba->drr,
+                       if (dump_bytes(dsp, dsp->dsa_drr,
                            sizeof (dmu_replay_record_t)) != 0)
-                               return (EINTR);
-                       ba->pending_op = PENDING_NONE;
+                               return (SET_ERROR(EINTR));
+                       dsp->dsa_pending_op = PENDING_NONE;
                }
        }
 
        /* write a FREEOBJECTS record */
-       bzero(ba->drr, sizeof (dmu_replay_record_t));
-       ba->drr->drr_type = DRR_FREEOBJECTS;
+       bzero(dsp->dsa_drr, sizeof (dmu_replay_record_t));
+       dsp->dsa_drr->drr_type = DRR_FREEOBJECTS;
        drrfo->drr_firstobj = firstobj;
        drrfo->drr_numobjs = numobjs;
-       drrfo->drr_toguid = ba->toguid;
+       drrfo->drr_toguid = dsp->dsa_toguid;
 
-       ba->pending_op = PENDING_FREEOBJECTS;
+       dsp->dsa_pending_op = PENDING_FREEOBJECTS;
 
        return (0);
 }
 
 static int
-dump_dnode(struct backuparg *ba, uint64_t object, dnode_phys_t *dnp)
+dump_dnode(dmu_sendarg_t *dsp, uint64_t object, dnode_phys_t *dnp)
 {
-       struct drr_object *drro = &(ba->drr->drr_u.drr_object);
+       struct drr_object *drro = &(dsp->dsa_drr->drr_u.drr_object);
 
        if (dnp == NULL || dnp->dn_type == DMU_OT_NONE)
-               return (dump_freeobjects(ba, object, 1));
+               return (dump_freeobjects(dsp, object, 1));
 
-       if (ba->pending_op != PENDING_NONE) {
-               if (dump_bytes(ba, ba->drr, sizeof (dmu_replay_record_t)) != 0)
-                       return (EINTR);
-               ba->pending_op = PENDING_NONE;
+       if (dsp->dsa_pending_op != PENDING_NONE) {
+               if (dump_bytes(dsp, dsp->dsa_drr,
+                   sizeof (dmu_replay_record_t)) != 0)
+                       return (SET_ERROR(EINTR));
+               dsp->dsa_pending_op = PENDING_NONE;
        }
 
        /* write an OBJECT record */
-       bzero(ba->drr, sizeof (dmu_replay_record_t));
-       ba->drr->drr_type = DRR_OBJECT;
+       bzero(dsp->dsa_drr, sizeof (dmu_replay_record_t));
+       dsp->dsa_drr->drr_type = DRR_OBJECT;
        drro->drr_object = object;
        drro->drr_type = dnp->dn_type;
        drro->drr_bonustype = dnp->dn_bonustype;
@@ -286,49 +398,83 @@ dump_dnode(struct backuparg *ba, uint64_t object, dnode_phys_t *dnp)
        drro->drr_bonuslen = dnp->dn_bonuslen;
        drro->drr_checksumtype = dnp->dn_checksum;
        drro->drr_compress = dnp->dn_compress;
-       drro->drr_toguid = ba->toguid;
+       drro->drr_toguid = dsp->dsa_toguid;
 
-       if (dump_bytes(ba, ba->drr, sizeof (dmu_replay_record_t)) != 0)
-               return (EINTR);
+       if (dump_bytes(dsp, dsp->dsa_drr, sizeof (dmu_replay_record_t)) != 0)
+               return (SET_ERROR(EINTR));
 
-       if (dump_bytes(ba, DN_BONUS(dnp), P2ROUNDUP(dnp->dn_bonuslen, 8)) != 0)
-               return (EINTR);
+       if (dump_bytes(dsp, DN_BONUS(dnp), P2ROUNDUP(dnp->dn_bonuslen, 8)) != 0)
+               return (SET_ERROR(EINTR));
 
-       /* free anything past the end of the file */
-       if (dump_free(ba, object, (dnp->dn_maxblkid + 1) *
-           (dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT), -1ULL))
-               return (EINTR);
-       if (ba->err)
-               return (EINTR);
+       /* Free anything past the end of the file. */
+       if (dump_free(dsp, object, (dnp->dn_maxblkid + 1) *
+           (dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT), -1ULL) != 0)
+               return (SET_ERROR(EINTR));
+       if (dsp->dsa_err != 0)
+               return (SET_ERROR(EINTR));
        return (0);
 }
 
+static boolean_t
+backup_do_embed(dmu_sendarg_t *dsp, const blkptr_t *bp)
+{
+       if (!BP_IS_EMBEDDED(bp))
+               return (B_FALSE);
+
+       /*
+        * Compression function must be legacy, or explicitly enabled.
+        */
+       if ((BP_GET_COMPRESS(bp) >= ZIO_COMPRESS_LEGACY_FUNCTIONS &&
+           !(dsp->dsa_featureflags & DMU_BACKUP_FEATURE_EMBED_DATA_LZ4)))
+               return (B_FALSE);
+
+       /*
+        * Embed type must be explicitly enabled.
+        */
+       switch (BPE_GET_ETYPE(bp)) {
+       case BP_EMBEDDED_TYPE_DATA:
+               if (dsp->dsa_featureflags & DMU_BACKUP_FEATURE_EMBED_DATA)
+                       return (B_TRUE);
+               break;
+       default:
+               return (B_FALSE);
+       }
+       return (B_FALSE);
+}
+
 #define        BP_SPAN(dnp, level) \
        (((uint64_t)dnp->dn_datablkszsec) << (SPA_MINBLOCKSHIFT + \
        (level) * (dnp->dn_indblkshift - SPA_BLKPTRSHIFT)))
 
 /* ARGSUSED */
 static int
-backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
-       struct backuparg *ba = arg;
+       dmu_sendarg_t *dsp = arg;
        dmu_object_type_t type = bp ? BP_GET_TYPE(bp) : DMU_OT_NONE;
        int err = 0;
 
        if (issig(JUSTLOOKING) && issig(FORREAL))
-               return (EINTR);
+               return (SET_ERROR(EINTR));
 
        if (zb->zb_object != DMU_META_DNODE_OBJECT &&
            DMU_OBJECT_IS_SPECIAL(zb->zb_object)) {
                return (0);
-       } else if (bp == NULL && zb->zb_object == DMU_META_DNODE_OBJECT) {
+       } else if (zb->zb_level == ZB_ZIL_LEVEL) {
+               /*
+                * If we are sending a non-snapshot (which is allowed on
+                * read-only pools), it may have a ZIL, which must be ignored.
+                */
+               return (0);
+       } else if (BP_IS_HOLE(bp) &&
+           zb->zb_object == DMU_META_DNODE_OBJECT) {
                uint64_t span = BP_SPAN(dnp, zb->zb_level);
                uint64_t dnobj = (zb->zb_blkid * span) >> DNODE_SHIFT;
-               err = dump_freeobjects(ba, dnobj, span >> DNODE_SHIFT);
-       } else if (bp == NULL) {
+               err = dump_freeobjects(dsp, dnobj, span >> DNODE_SHIFT);
+       } else if (BP_IS_HOLE(bp)) {
                uint64_t span = BP_SPAN(dnp, zb->zb_level);
-               err = dump_free(ba, zb->zb_object, zb->zb_blkid * span, span);
+               err = dump_free(dsp, zb->zb_object, zb->zb_blkid * span, span);
        } else if (zb->zb_level > 0 || type == DMU_OT_OBJSET) {
                return (0);
        } else if (type == DMU_OT_DNODE) {
@@ -338,17 +484,17 @@ backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf,
                uint32_t aflags = ARC_WAIT;
                arc_buf_t *abuf;
 
-               if (dsl_read(NULL, spa, bp, pbuf,
-                   arc_getbuf_func, &abuf, ZIO_PRIORITY_ASYNC_READ,
-                   ZIO_FLAG_CANFAIL, &aflags, zb) != 0)
-                       return (EIO);
+               if (arc_read(NULL, spa, bp, arc_getbuf_func, &abuf,
+                   ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL,
+                   &aflags, zb) != 0)
+                       return (SET_ERROR(EIO));
 
                blk = abuf->b_data;
                for (i = 0; i < blksz >> DNODE_SHIFT; i++) {
                        uint64_t dnobj = (zb->zb_blkid <<
                            (DNODE_BLOCK_SHIFT - DNODE_SHIFT)) + i;
-                       err = dump_dnode(ba, dnobj, blk+i);
-                       if (err)
+                       err = dump_dnode(dsp, dnobj, blk+i);
+                       if (err != 0)
                                break;
                }
                (void) arc_buf_remove_ref(abuf, &abuf);
@@ -357,21 +503,28 @@ backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf,
                arc_buf_t *abuf;
                int blksz = BP_GET_LSIZE(bp);
 
-               if (arc_read_nolock(NULL, spa, bp,
-                   arc_getbuf_func, &abuf, ZIO_PRIORITY_ASYNC_READ,
-                   ZIO_FLAG_CANFAIL, &aflags, zb) != 0)
-                       return (EIO);
+               if (arc_read(NULL, spa, bp, arc_getbuf_func, &abuf,
+                   ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL,
+                   &aflags, zb) != 0)
+                       return (SET_ERROR(EIO));
 
-               err = dump_spill(ba, zb->zb_object, blksz, abuf->b_data);
+               err = dump_spill(dsp, zb->zb_object, blksz, abuf->b_data);
                (void) arc_buf_remove_ref(abuf, &abuf);
+       } else if (backup_do_embed(dsp, bp)) {
+               /* it's an embedded level-0 block of a regular object */
+               int blksz = dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT;
+               err = dump_write_embedded(dsp, zb->zb_object,
+                   zb->zb_blkid * blksz, blksz, bp);
        } else { /* it's a level-0 block of a regular object */
                uint32_t aflags = ARC_WAIT;
                arc_buf_t *abuf;
                int blksz = BP_GET_LSIZE(bp);
 
-               if (dsl_read(NULL, spa, bp, pbuf,
-                   arc_getbuf_func, &abuf, ZIO_PRIORITY_ASYNC_READ,
-                   ZIO_FLAG_CANFAIL, &aflags, zb) != 0) {
+               ASSERT3U(blksz, ==, dnp->dn_datablkszsec << SPA_MINBLOCKSHIFT);
+               ASSERT0(zb->zb_level);
+               if (arc_read(NULL, spa, bp, arc_getbuf_func, &abuf,
+                   ZIO_PRIORITY_ASYNC_READ, ZIO_FLAG_CANFAIL,
+                   &aflags, zb) != 0) {
                        if (zfs_send_corrupt_data) {
                                uint64_t *ptr;
                                /* Send a block filled with 0x"zfs badd bloc" */
@@ -380,13 +533,13 @@ backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf,
                                for (ptr = abuf->b_data;
                                    (char *)ptr < (char *)abuf->b_data + blksz;
                                    ptr++)
-                                       *ptr = 0x2f5baddb10c;
+                                       *ptr = 0x2f5baddb10cULL;
                        } else {
-                               return (EIO);
+                               return (SET_ERROR(EIO));
                        }
                }
 
-               err = dump_data(ba, type, zb->zb_object, zb->zb_blkid * blksz,
+               err = dump_write(dsp, type, zb->zb_object, zb->zb_blkid * blksz,
                    blksz, bp, abuf->b_data);
                (void) arc_buf_remove_ref(abuf, &abuf);
        }
@@ -395,45 +548,27 @@ backup_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp, arc_buf_t *pbuf,
        return (err);
 }
 
-int
-dmu_sendbackup(objset_t *tosnap, objset_t *fromsnap, boolean_t fromorigin,
-    vnode_t *vp, offset_t *off)
+/*
+ * Releases dp using the specified tag.
+ */
+static int
+dmu_send_impl(void *tag, dsl_pool_t *dp, dsl_dataset_t *ds,
+    zfs_bookmark_phys_t *fromzb, boolean_t is_clone, boolean_t embedok,
+    int outfd, vnode_t *vp, offset_t *off)
 {
-       dsl_dataset_t *ds = tosnap->os_dsl_dataset;
-       dsl_dataset_t *fromds = fromsnap ? fromsnap->os_dsl_dataset : NULL;
+       objset_t *os;
        dmu_replay_record_t *drr;
-       struct backuparg ba;
+       dmu_sendarg_t *dsp;
        int err;
        uint64_t fromtxg = 0;
+       uint64_t featureflags = 0;
 
-       /* tosnap must be a snapshot */
-       if (ds->ds_phys->ds_next_snap_obj == 0)
-               return (EINVAL);
-
-       /* fromsnap must be an earlier snapshot from the same fs as tosnap */
-       if (fromds && (ds->ds_dir != fromds->ds_dir ||
-           fromds->ds_phys->ds_creation_txg >= ds->ds_phys->ds_creation_txg))
-               return (EXDEV);
-
-       if (fromorigin) {
-               dsl_pool_t *dp = ds->ds_dir->dd_pool;
-
-               if (fromsnap)
-                       return (EINVAL);
-
-               if (dsl_dir_is_clone(ds->ds_dir)) {
-                       rw_enter(&dp->dp_config_rwlock, RW_READER);
-                       err = dsl_dataset_hold_obj(dp,
-                           ds->ds_dir->dd_phys->dd_origin_obj, FTAG, &fromds);
-                       rw_exit(&dp->dp_config_rwlock);
-                       if (err)
-                               return (err);
-               } else {
-                       fromorigin = B_FALSE;
-               }
+       err = dmu_objset_from_ds(ds, &os);
+       if (err != 0) {
+               dsl_pool_rele(dp, tag);
+               return (err);
        }
 
-
        drr = kmem_zalloc(sizeof (dmu_replay_record_t), KM_SLEEP);
        drr->drr_type = DRR_BEGIN;
        drr->drr_u.drr_begin.drr_magic = DMU_BACKUP_MAGIC;
@@ -441,123 +576,268 @@ dmu_sendbackup(objset_t *tosnap, objset_t *fromsnap, boolean_t fromorigin,
            DMU_SUBSTREAM);
 
 #ifdef _KERNEL
-       if (dmu_objset_type(tosnap) == DMU_OST_ZFS) {
+       if (dmu_objset_type(os) == DMU_OST_ZFS) {
                uint64_t version;
-               if (zfs_get_zplprop(tosnap, ZFS_PROP_VERSION, &version) != 0)
-                       return (EINVAL);
-               if (version == ZPL_VERSION_SA) {
-                       DMU_SET_FEATUREFLAGS(
-                           drr->drr_u.drr_begin.drr_versioninfo,
-                           DMU_BACKUP_FEATURE_SA_SPILL);
+               if (zfs_get_zplprop(os, ZFS_PROP_VERSION, &version) != 0) {
+                       kmem_free(drr, sizeof (dmu_replay_record_t));
+                       dsl_pool_rele(dp, tag);
+                       return (SET_ERROR(EINVAL));
+               }
+               if (version >= ZPL_VERSION_SA) {
+                       featureflags |= DMU_BACKUP_FEATURE_SA_SPILL;
                }
        }
 #endif
 
+       if (embedok &&
+           spa_feature_is_active(dp->dp_spa, SPA_FEATURE_EMBEDDED_DATA)) {
+               featureflags |= DMU_BACKUP_FEATURE_EMBED_DATA;
+               if (spa_feature_is_active(dp->dp_spa, SPA_FEATURE_LZ4_COMPRESS))
+                       featureflags |= DMU_BACKUP_FEATURE_EMBED_DATA_LZ4;
+       } else {
+               embedok = B_FALSE;
+       }
+
+       DMU_SET_FEATUREFLAGS(drr->drr_u.drr_begin.drr_versioninfo,
+           featureflags);
+
        drr->drr_u.drr_begin.drr_creation_time =
-           ds->ds_phys->ds_creation_time;
-       drr->drr_u.drr_begin.drr_type = tosnap->os_phys->os_type;
-       if (fromorigin)
+           dsl_dataset_phys(ds)->ds_creation_time;
+       drr->drr_u.drr_begin.drr_type = dmu_objset_type(os);
+       if (is_clone)
                drr->drr_u.drr_begin.drr_flags |= DRR_FLAG_CLONE;
-       drr->drr_u.drr_begin.drr_toguid = ds->ds_phys->ds_guid;
-       if (ds->ds_phys->ds_flags & DS_FLAG_CI_DATASET)
+       drr->drr_u.drr_begin.drr_toguid = dsl_dataset_phys(ds)->ds_guid;
+       if (dsl_dataset_phys(ds)->ds_flags & DS_FLAG_CI_DATASET)
                drr->drr_u.drr_begin.drr_flags |= DRR_FLAG_CI_DATA;
 
-       if (fromds)
-               drr->drr_u.drr_begin.drr_fromguid = fromds->ds_phys->ds_guid;
+       if (fromzb != NULL) {
+               drr->drr_u.drr_begin.drr_fromguid = fromzb->zbm_guid;
+               fromtxg = fromzb->zbm_creation_txg;
+       }
        dsl_dataset_name(ds, drr->drr_u.drr_begin.drr_toname);
+       if (!dsl_dataset_is_snapshot(ds)) {
+               (void) strlcat(drr->drr_u.drr_begin.drr_toname, "@--head--",
+                   sizeof (drr->drr_u.drr_begin.drr_toname));
+       }
 
-       if (fromds)
-               fromtxg = fromds->ds_phys->ds_creation_txg;
-       if (fromorigin)
-               dsl_dataset_rele(fromds, FTAG);
-
-       ba.drr = drr;
-       ba.vp = vp;
-       ba.os = tosnap;
-       ba.off = off;
-       ba.toguid = ds->ds_phys->ds_guid;
-       ZIO_SET_CHECKSUM(&ba.zc, 0, 0, 0, 0);
-       ba.pending_op = PENDING_NONE;
-
-       if (dump_bytes(&ba, drr, sizeof (dmu_replay_record_t)) != 0) {
-               kmem_free(drr, sizeof (dmu_replay_record_t));
-               return (ba.err);
+       dsp = kmem_zalloc(sizeof (dmu_sendarg_t), KM_SLEEP);
+
+       dsp->dsa_drr = drr;
+       dsp->dsa_vp = vp;
+       dsp->dsa_outfd = outfd;
+       dsp->dsa_proc = curproc;
+       dsp->dsa_os = os;
+       dsp->dsa_off = off;
+       dsp->dsa_toguid = dsl_dataset_phys(ds)->ds_guid;
+       ZIO_SET_CHECKSUM(&dsp->dsa_zc, 0, 0, 0, 0);
+       dsp->dsa_pending_op = PENDING_NONE;
+       dsp->dsa_incremental = (fromzb != NULL);
+       dsp->dsa_featureflags = featureflags;
+
+       mutex_enter(&ds->ds_sendstream_lock);
+       list_insert_head(&ds->ds_sendstreams, dsp);
+       mutex_exit(&ds->ds_sendstream_lock);
+
+       dsl_dataset_long_hold(ds, FTAG);
+       dsl_pool_rele(dp, tag);
+
+       if (dump_bytes(dsp, drr, sizeof (dmu_replay_record_t)) != 0) {
+               err = dsp->dsa_err;
+               goto out;
        }
 
        err = traverse_dataset(ds, fromtxg, TRAVERSE_PRE | TRAVERSE_PREFETCH,
-           backup_cb, &ba);
+           backup_cb, dsp);
 
-       if (ba.pending_op != PENDING_NONE)
-               if (dump_bytes(&ba, drr, sizeof (dmu_replay_record_t)) != 0)
-                       err = EINTR;
+       if (dsp->dsa_pending_op != PENDING_NONE)
+               if (dump_bytes(dsp, drr, sizeof (dmu_replay_record_t)) != 0)
+                       err = SET_ERROR(EINTR);
 
-       if (err) {
-               if (err == EINTR && ba.err)
-                       err = ba.err;
-               kmem_free(drr, sizeof (dmu_replay_record_t));
-               return (err);
+       if (err != 0) {
+               if (err == EINTR && dsp->dsa_err != 0)
+                       err = dsp->dsa_err;
+               goto out;
        }
 
        bzero(drr, sizeof (dmu_replay_record_t));
        drr->drr_type = DRR_END;
-       drr->drr_u.drr_end.drr_checksum = ba.zc;
-       drr->drr_u.drr_end.drr_toguid = ba.toguid;
+       drr->drr_u.drr_end.drr_checksum = dsp->dsa_zc;
+       drr->drr_u.drr_end.drr_toguid = dsp->dsa_toguid;
 
-       if (dump_bytes(&ba, drr, sizeof (dmu_replay_record_t)) != 0) {
-               kmem_free(drr, sizeof (dmu_replay_record_t));
-               return (ba.err);
+       if (dump_bytes(dsp, drr, sizeof (dmu_replay_record_t)) != 0) {
+               err = dsp->dsa_err;
+               goto out;
        }
 
+out:
+       mutex_enter(&ds->ds_sendstream_lock);
+       list_remove(&ds->ds_sendstreams, dsp);
+       mutex_exit(&ds->ds_sendstream_lock);
+
        kmem_free(drr, sizeof (dmu_replay_record_t));
+       kmem_free(dsp, sizeof (dmu_sendarg_t));
 
-       return (0);
+       dsl_dataset_long_rele(ds, FTAG);
+
+       return (err);
 }
 
 int
-dmu_send_estimate(objset_t *tosnap, objset_t *fromsnap, boolean_t fromorigin,
-    uint64_t *sizep)
+dmu_send_obj(const char *pool, uint64_t tosnap, uint64_t fromsnap,
+    boolean_t embedok, int outfd, vnode_t *vp, offset_t *off)
 {
-       dsl_dataset_t *ds = tosnap->os_dsl_dataset;
-       dsl_dataset_t *fromds = fromsnap ? fromsnap->os_dsl_dataset : NULL;
-       dsl_pool_t *dp = ds->ds_dir->dd_pool;
+       dsl_pool_t *dp;
+       dsl_dataset_t *ds;
+       dsl_dataset_t *fromds = NULL;
        int err;
-       uint64_t size, recordsize;
 
-       /* tosnap must be a snapshot */
-       if (ds->ds_phys->ds_next_snap_obj == 0)
-               return (EINVAL);
+       err = dsl_pool_hold(pool, FTAG, &dp);
+       if (err != 0)
+               return (err);
+
+       err = dsl_dataset_hold_obj(dp, tosnap, FTAG, &ds);
+       if (err != 0) {
+               dsl_pool_rele(dp, FTAG);
+               return (err);
+       }
+
+       if (fromsnap != 0) {
+               zfs_bookmark_phys_t zb;
+               boolean_t is_clone;
 
-       /* fromsnap must be an earlier snapshot from the same fs as tosnap */
-       if (fromds && (ds->ds_dir != fromds->ds_dir ||
-           fromds->ds_phys->ds_creation_txg >= ds->ds_phys->ds_creation_txg))
-               return (EXDEV);
-
-       if (fromorigin) {
-               if (fromsnap)
-                       return (EINVAL);
-
-               if (dsl_dir_is_clone(ds->ds_dir)) {
-                       rw_enter(&dp->dp_config_rwlock, RW_READER);
-                       err = dsl_dataset_hold_obj(dp,
-                           ds->ds_dir->dd_phys->dd_origin_obj, FTAG, &fromds);
-                       rw_exit(&dp->dp_config_rwlock);
-                       if (err)
-                               return (err);
+               err = dsl_dataset_hold_obj(dp, fromsnap, FTAG, &fromds);
+               if (err != 0) {
+                       dsl_dataset_rele(ds, FTAG);
+                       dsl_pool_rele(dp, FTAG);
+                       return (err);
+               }
+               if (!dsl_dataset_is_before(ds, fromds, 0))
+                       err = SET_ERROR(EXDEV);
+               zb.zbm_creation_time =
+                   dsl_dataset_phys(fromds)->ds_creation_time;
+               zb.zbm_creation_txg = dsl_dataset_phys(fromds)->ds_creation_txg;
+               zb.zbm_guid = dsl_dataset_phys(fromds)->ds_guid;
+               is_clone = (fromds->ds_dir != ds->ds_dir);
+               dsl_dataset_rele(fromds, FTAG);
+               err = dmu_send_impl(FTAG, dp, ds, &zb, is_clone, embedok,
+                   outfd, vp, off);
+       } else {
+               err = dmu_send_impl(FTAG, dp, ds, NULL, B_FALSE, embedok,
+                   outfd, vp, off);
+       }
+       dsl_dataset_rele(ds, FTAG);
+       return (err);
+}
+
+int
+dmu_send(const char *tosnap, const char *fromsnap, boolean_t embedok,
+    int outfd, vnode_t *vp, offset_t *off)
+{
+       dsl_pool_t *dp;
+       dsl_dataset_t *ds;
+       int err;
+       boolean_t owned = B_FALSE;
+
+       if (fromsnap != NULL && strpbrk(fromsnap, "@#") == NULL)
+               return (SET_ERROR(EINVAL));
+
+       err = dsl_pool_hold(tosnap, FTAG, &dp);
+       if (err != 0)
+               return (err);
+
+       if (strchr(tosnap, '@') == NULL && spa_writeable(dp->dp_spa)) {
+               /*
+                * We are sending a filesystem or volume.  Ensure
+                * that it doesn't change by owning the dataset.
+                */
+               err = dsl_dataset_own(dp, tosnap, FTAG, &ds);
+               owned = B_TRUE;
+       } else {
+               err = dsl_dataset_hold(dp, tosnap, FTAG, &ds);
+       }
+       if (err != 0) {
+               dsl_pool_rele(dp, FTAG);
+               return (err);
+       }
+
+       if (fromsnap != NULL) {
+               zfs_bookmark_phys_t zb;
+               boolean_t is_clone = B_FALSE;
+               int fsnamelen = strchr(tosnap, '@') - tosnap;
+
+               /*
+                * If the fromsnap is in a different filesystem, then
+                * mark the send stream as a clone.
+                */
+               if (strncmp(tosnap, fromsnap, fsnamelen) != 0 ||
+                   (fromsnap[fsnamelen] != '@' &&
+                   fromsnap[fsnamelen] != '#')) {
+                       is_clone = B_TRUE;
+               }
+
+               if (strchr(fromsnap, '@')) {
+                       dsl_dataset_t *fromds;
+                       err = dsl_dataset_hold(dp, fromsnap, FTAG, &fromds);
+                       if (err == 0) {
+                               if (!dsl_dataset_is_before(ds, fromds, 0))
+                                       err = SET_ERROR(EXDEV);
+                               zb.zbm_creation_time =
+                                   dsl_dataset_phys(fromds)->ds_creation_time;
+                               zb.zbm_creation_txg =
+                                   dsl_dataset_phys(fromds)->ds_creation_txg;
+                               zb.zbm_guid = dsl_dataset_phys(fromds)->ds_guid;
+                               is_clone = (ds->ds_dir != fromds->ds_dir);
+                               dsl_dataset_rele(fromds, FTAG);
+                       }
                } else {
-                       fromorigin = B_FALSE;
+                       err = dsl_bookmark_lookup(dp, fromsnap, ds, &zb);
                }
+               if (err != 0) {
+                       dsl_dataset_rele(ds, FTAG);
+                       dsl_pool_rele(dp, FTAG);
+                       return (err);
+               }
+               err = dmu_send_impl(FTAG, dp, ds, &zb, is_clone, embedok,
+                   outfd, vp, off);
+       } else {
+               err = dmu_send_impl(FTAG, dp, ds, NULL, B_FALSE, embedok,
+                   outfd, vp, off);
        }
+       if (owned)
+               dsl_dataset_disown(ds, FTAG);
+       else
+               dsl_dataset_rele(ds, FTAG);
+       return (err);
+}
+
+int
+dmu_send_estimate(dsl_dataset_t *ds, dsl_dataset_t *fromds, uint64_t *sizep)
+{
+       int err;
+       uint64_t size, recordsize;
+       ASSERTV(dsl_pool_t *dp = ds->ds_dir->dd_pool);
+
+       ASSERT(dsl_pool_config_held(dp));
+
+       /* tosnap must be a snapshot */
+       if (!dsl_dataset_is_snapshot(ds))
+               return (SET_ERROR(EINVAL));
+
+       /*
+        * fromsnap must be an earlier snapshot from the same fs as tosnap,
+        * or the origin's fs.
+        */
+       if (fromds != NULL && !dsl_dataset_is_before(ds, fromds, 0))
+               return (SET_ERROR(EXDEV));
 
        /* Get uncompressed size estimate of changed data. */
        if (fromds == NULL) {
-               size = ds->ds_phys->ds_uncompressed_bytes;
+               size = dsl_dataset_phys(ds)->ds_uncompressed_bytes;
        } else {
                uint64_t used, comp;
                err = dsl_dataset_space_written(fromds, ds,
                    &used, &comp, &size);
-               if (fromorigin)
-                       dsl_dataset_rele(fromds, FTAG);
-               if (err)
+               if (err != 0)
                        return (err);
        }
 
@@ -576,11 +856,8 @@ dmu_send_estimate(objset_t *tosnap, objset_t *fromsnap, boolean_t fromorigin,
         * Therefore, space used by indirect blocks is sizeof(blkptr_t) per
         * block, which we observe in practice.
         */
-       rw_enter(&dp->dp_config_rwlock, RW_READER);
-       err = dsl_prop_get_ds(ds, "recordsize",
-           sizeof (recordsize), 1, &recordsize, NULL);
-       rw_exit(&dp->dp_config_rwlock);
-       if (err)
+       err = dsl_prop_get_int_ds(ds, "recordsize", &recordsize);
+       if (err != 0)
                return (err);
        size -= size / recordsize * sizeof (blkptr_t);
 
@@ -592,184 +869,277 @@ dmu_send_estimate(objset_t *tosnap, objset_t *fromsnap, boolean_t fromorigin,
        return (0);
 }
 
-struct recvbeginsyncarg {
-       const char *tofs;
-       const char *tosnap;
-       dsl_dataset_t *origin;
-       uint64_t fromguid;
-       dmu_objset_type_t type;
-       void *tag;
-       boolean_t force;
-       uint64_t dsflags;
-       char clonelastname[MAXNAMELEN];
-       dsl_dataset_t *ds; /* the ds to recv into; returned from the syncfunc */
-       cred_t *cr;
-};
+typedef struct dmu_recv_begin_arg {
+       const char *drba_origin;
+       dmu_recv_cookie_t *drba_cookie;
+       cred_t *drba_cred;
+       uint64_t drba_snapobj;
+} dmu_recv_begin_arg_t;
 
-/* ARGSUSED */
 static int
-recv_new_check(void *arg1, void *arg2, dmu_tx_t *tx)
+recv_begin_check_existing_impl(dmu_recv_begin_arg_t *drba, dsl_dataset_t *ds,
+    uint64_t fromguid)
 {
-       dsl_dir_t *dd = arg1;
-       struct recvbeginsyncarg *rbsa = arg2;
-       objset_t *mos = dd->dd_pool->dp_meta_objset;
        uint64_t val;
-       int err;
+       int error;
+       dsl_pool_t *dp = ds->ds_dir->dd_pool;
 
-       err = zap_lookup(mos, dd->dd_phys->dd_child_dir_zapobj,
-           strrchr(rbsa->tofs, '/') + 1, sizeof (uint64_t), 1, &val);
+       /* temporary clone name must not exist */
+       error = zap_lookup(dp->dp_meta_objset,
+           dsl_dir_phys(ds->ds_dir)->dd_child_dir_zapobj, recv_clone_name,
+           8, 1, &val);
+       if (error != ENOENT)
+               return (error == 0 ? EBUSY : error);
+
+       /* new snapshot name must not exist */
+       error = zap_lookup(dp->dp_meta_objset,
+           dsl_dataset_phys(ds)->ds_snapnames_zapobj,
+           drba->drba_cookie->drc_tosnap, 8, 1, &val);
+       if (error != ENOENT)
+               return (error == 0 ? EEXIST : error);
+
+       /*
+        * Check snapshot limit before receiving. We'll recheck again at the
+        * end, but might as well abort before receiving if we're already over
+        * the limit.
+        *
+        * Note that we do not check the file system limit with
+        * dsl_dir_fscount_check because the temporary %clones don't count
+        * against that limit.
+        */
+       error = dsl_fs_ss_limit_check(ds->ds_dir, 1, ZFS_PROP_SNAPSHOT_LIMIT,
+           NULL, drba->drba_cred);
+       if (error != 0)
+               return (error);
+
+       if (fromguid != 0) {
+               dsl_dataset_t *snap;
+               uint64_t obj = dsl_dataset_phys(ds)->ds_prev_snap_obj;
+
+               /* Find snapshot in this dir that matches fromguid. */
+               while (obj != 0) {
+                       error = dsl_dataset_hold_obj(dp, obj, FTAG,
+                           &snap);
+                       if (error != 0)
+                               return (SET_ERROR(ENODEV));
+                       if (snap->ds_dir != ds->ds_dir) {
+                               dsl_dataset_rele(snap, FTAG);
+                               return (SET_ERROR(ENODEV));
+                       }
+                       if (dsl_dataset_phys(snap)->ds_guid == fromguid)
+                               break;
+                       obj = dsl_dataset_phys(snap)->ds_prev_snap_obj;
+                       dsl_dataset_rele(snap, FTAG);
+               }
+               if (obj == 0)
+                       return (SET_ERROR(ENODEV));
 
-       if (err != ENOENT)
-               return (err ? err : EEXIST);
+               if (drba->drba_cookie->drc_force) {
+                       drba->drba_snapobj = obj;
+               } else {
+                       /*
+                        * If we are not forcing, there must be no
+                        * changes since fromsnap.
+                        */
+                       if (dsl_dataset_modified_since_snap(ds, snap)) {
+                               dsl_dataset_rele(snap, FTAG);
+                               return (SET_ERROR(ETXTBSY));
+                       }
+                       drba->drba_snapobj = ds->ds_prev->ds_object;
+               }
 
-       if (rbsa->origin) {
-               /* make sure it's a snap in the same pool */
-               if (rbsa->origin->ds_dir->dd_pool != dd->dd_pool)
-                       return (EXDEV);
-               if (!dsl_dataset_is_snapshot(rbsa->origin))
-                       return (EINVAL);
-               if (rbsa->origin->ds_phys->ds_guid != rbsa->fromguid)
-                       return (ENODEV);
+               dsl_dataset_rele(snap, FTAG);
+       } else {
+               /* if full, most recent snapshot must be $ORIGIN */
+               if (dsl_dataset_phys(ds)->ds_prev_snap_txg >= TXG_INITIAL)
+                       return (SET_ERROR(ENODEV));
+               drba->drba_snapobj = dsl_dataset_phys(ds)->ds_prev_snap_obj;
        }
 
        return (0);
+
 }
 
-static void
-recv_new_sync(void *arg1, void *arg2, dmu_tx_t *tx)
+static int
+dmu_recv_begin_check(void *arg, dmu_tx_t *tx)
 {
-       dsl_dir_t *dd = arg1;
-       struct recvbeginsyncarg *rbsa = arg2;
-       uint64_t flags = DS_FLAG_INCONSISTENT | rbsa->dsflags;
-       uint64_t dsobj;
+       dmu_recv_begin_arg_t *drba = arg;
+       dsl_pool_t *dp = dmu_tx_pool(tx);
+       struct drr_begin *drrb = drba->drba_cookie->drc_drrb;
+       uint64_t fromguid = drrb->drr_fromguid;
+       int flags = drrb->drr_flags;
+       int error;
+       uint64_t featureflags = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo);
+       dsl_dataset_t *ds;
+       const char *tofs = drba->drba_cookie->drc_tofs;
 
-       /* Create and open new dataset. */
-       dsobj = dsl_dataset_create_sync(dd, strrchr(rbsa->tofs, '/') + 1,
-           rbsa->origin, flags, rbsa->cr, tx);
-       VERIFY(0 == dsl_dataset_own_obj(dd->dd_pool, dsobj,
-           B_TRUE, dmu_recv_tag, &rbsa->ds));
+       /* already checked */
+       ASSERT3U(drrb->drr_magic, ==, DMU_BACKUP_MAGIC);
 
-       if (rbsa->origin == NULL) {
-               (void) dmu_objset_create_impl(dd->dd_pool->dp_spa,
-                   rbsa->ds, &rbsa->ds->ds_phys->ds_bp, rbsa->type, tx);
-       }
+       if (DMU_GET_STREAM_HDRTYPE(drrb->drr_versioninfo) ==
+           DMU_COMPOUNDSTREAM ||
+           drrb->drr_type >= DMU_OST_NUMTYPES ||
+           ((flags & DRR_FLAG_CLONE) && drba->drba_origin == NULL))
+               return (SET_ERROR(EINVAL));
 
-       spa_history_log_internal(LOG_DS_REPLAY_FULL_SYNC,
-           dd->dd_pool->dp_spa, tx, "dataset = %lld", dsobj);
-}
+       /* Verify pool version supports SA if SA_SPILL feature set */
+       if ((featureflags & DMU_BACKUP_FEATURE_SA_SPILL) &&
+           spa_version(dp->dp_spa) < SPA_VERSION_SA)
+               return (SET_ERROR(ENOTSUP));
 
-/* ARGSUSED */
-static int
-recv_existing_check(void *arg1, void *arg2, dmu_tx_t *tx)
-{
-       dsl_dataset_t *ds = arg1;
-       struct recvbeginsyncarg *rbsa = arg2;
-       int err;
-       uint64_t val;
+       /*
+        * The receiving code doesn't know how to translate a WRITE_EMBEDDED
+        * record to a plan WRITE record, so the pool must have the
+        * EMBEDDED_DATA feature enabled if the stream has WRITE_EMBEDDED
+        * records.  Same with WRITE_EMBEDDED records that use LZ4 compression.
+        */
+       if ((featureflags & DMU_BACKUP_FEATURE_EMBED_DATA) &&
+           !spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_EMBEDDED_DATA))
+               return (SET_ERROR(ENOTSUP));
+       if ((featureflags & DMU_BACKUP_FEATURE_EMBED_DATA_LZ4) &&
+           !spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_LZ4_COMPRESS))
+               return (SET_ERROR(ENOTSUP));
+
+       error = dsl_dataset_hold(dp, tofs, FTAG, &ds);
+       if (error == 0) {
+               /* target fs already exists; recv into temp clone */
 
-       /* must not have any changes since most recent snapshot */
-       if (!rbsa->force && dsl_dataset_modified_since_lastsnap(ds))
-               return (ETXTBSY);
+               /* Can't recv a clone into an existing fs */
+               if (flags & DRR_FLAG_CLONE) {
+                       dsl_dataset_rele(ds, FTAG);
+                       return (SET_ERROR(EINVAL));
+               }
 
-       /* new snapshot name must not exist */
-       err = zap_lookup(ds->ds_dir->dd_pool->dp_meta_objset,
-           ds->ds_phys->ds_snapnames_zapobj, rbsa->tosnap, 8, 1, &val);
-       if (err == 0)
-               return (EEXIST);
-       if (err != ENOENT)
-               return (err);
+               error = recv_begin_check_existing_impl(drba, ds, fromguid);
+               dsl_dataset_rele(ds, FTAG);
+       } else if (error == ENOENT) {
+               /* target fs does not exist; must be a full backup or clone */
+               char buf[MAXNAMELEN];
 
-       if (rbsa->fromguid) {
-               /* if incremental, most recent snapshot must match fromguid */
-               if (ds->ds_prev == NULL)
-                       return (ENODEV);
+               /*
+                * If it's a non-clone incremental, we are missing the
+                * target fs, so fail the recv.
+                */
+               if (fromguid != 0 && !(flags & DRR_FLAG_CLONE))
+                       return (SET_ERROR(ENOENT));
+
+               /* Open the parent of tofs */
+               ASSERT3U(strlen(tofs), <, MAXNAMELEN);
+               (void) strlcpy(buf, tofs, strrchr(tofs, '/') - tofs + 1);
+               error = dsl_dataset_hold(dp, buf, FTAG, &ds);
+               if (error != 0)
+                       return (error);
 
                /*
-                * most recent snapshot must match fromguid, or there are no
-                * changes since the fromguid one
+                * Check filesystem and snapshot limits before receiving. We'll
+                * recheck snapshot limits again at the end (we create the
+                * filesystems and increment those counts during begin_sync).
                 */
-               if (ds->ds_prev->ds_phys->ds_guid != rbsa->fromguid) {
-                       uint64_t birth = ds->ds_prev->ds_phys->ds_bp.blk_birth;
-                       uint64_t obj = ds->ds_prev->ds_phys->ds_prev_snap_obj;
-                       while (obj != 0) {
-                               dsl_dataset_t *snap;
-                               err = dsl_dataset_hold_obj(ds->ds_dir->dd_pool,
-                                   obj, FTAG, &snap);
-                               if (err)
-                                       return (ENODEV);
-                               if (snap->ds_phys->ds_creation_txg < birth) {
-                                       dsl_dataset_rele(snap, FTAG);
-                                       return (ENODEV);
-                               }
-                               if (snap->ds_phys->ds_guid == rbsa->fromguid) {
-                                       dsl_dataset_rele(snap, FTAG);
-                                       break; /* it's ok */
-                               }
-                               obj = snap->ds_phys->ds_prev_snap_obj;
-                               dsl_dataset_rele(snap, FTAG);
-                       }
-                       if (obj == 0)
-                               return (ENODEV);
+               error = dsl_fs_ss_limit_check(ds->ds_dir, 1,
+                   ZFS_PROP_FILESYSTEM_LIMIT, NULL, drba->drba_cred);
+               if (error != 0) {
+                       dsl_dataset_rele(ds, FTAG);
+                       return (error);
                }
-       } else {
-               /* if full, most recent snapshot must be $ORIGIN */
-               if (ds->ds_phys->ds_prev_snap_txg >= TXG_INITIAL)
-                       return (ENODEV);
-       }
 
-       /* temporary clone name must not exist */
-       err = zap_lookup(ds->ds_dir->dd_pool->dp_meta_objset,
-           ds->ds_dir->dd_phys->dd_child_dir_zapobj,
-           rbsa->clonelastname, 8, 1, &val);
-       if (err == 0)
-               return (EEXIST);
-       if (err != ENOENT)
-               return (err);
+               error = dsl_fs_ss_limit_check(ds->ds_dir, 1,
+                   ZFS_PROP_SNAPSHOT_LIMIT, NULL, drba->drba_cred);
+               if (error != 0) {
+                       dsl_dataset_rele(ds, FTAG);
+                       return (error);
+               }
 
-       return (0);
+               if (drba->drba_origin != NULL) {
+                       dsl_dataset_t *origin;
+                       error = dsl_dataset_hold(dp, drba->drba_origin,
+                           FTAG, &origin);
+                       if (error != 0) {
+                               dsl_dataset_rele(ds, FTAG);
+                               return (error);
+                       }
+                       if (!dsl_dataset_is_snapshot(origin)) {
+                               dsl_dataset_rele(origin, FTAG);
+                               dsl_dataset_rele(ds, FTAG);
+                               return (SET_ERROR(EINVAL));
+                       }
+                       if (dsl_dataset_phys(origin)->ds_guid != fromguid) {
+                               dsl_dataset_rele(origin, FTAG);
+                               dsl_dataset_rele(ds, FTAG);
+                               return (SET_ERROR(ENODEV));
+                       }
+                       dsl_dataset_rele(origin, FTAG);
+               }
+               dsl_dataset_rele(ds, FTAG);
+               error = 0;
+       }
+       return (error);
 }
 
-/* ARGSUSED */
 static void
-recv_existing_sync(void *arg1, void *arg2, dmu_tx_t *tx)
+dmu_recv_begin_sync(void *arg, dmu_tx_t *tx)
 {
-       dsl_dataset_t *ohds = arg1;
-       struct recvbeginsyncarg *rbsa = arg2;
-       dsl_pool_t *dp = ohds->ds_dir->dd_pool;
-       dsl_dataset_t *cds;
-       uint64_t flags = DS_FLAG_INCONSISTENT | rbsa->dsflags;
+       dmu_recv_begin_arg_t *drba = arg;
+       dsl_pool_t *dp = dmu_tx_pool(tx);
+       struct drr_begin *drrb = drba->drba_cookie->drc_drrb;
+       const char *tofs = drba->drba_cookie->drc_tofs;
+       dsl_dataset_t *ds, *newds;
        uint64_t dsobj;
+       int error;
+       uint64_t crflags;
+
+       crflags = (drrb->drr_flags & DRR_FLAG_CI_DATA) ?
+           DS_FLAG_CI_DATASET : 0;
+
+       error = dsl_dataset_hold(dp, tofs, FTAG, &ds);
+       if (error == 0) {
+               /* create temporary clone */
+               dsl_dataset_t *snap = NULL;
+               if (drba->drba_snapobj != 0) {
+                       VERIFY0(dsl_dataset_hold_obj(dp,
+                           drba->drba_snapobj, FTAG, &snap));
+               }
+               dsobj = dsl_dataset_create_sync(ds->ds_dir, recv_clone_name,
+                   snap, crflags, drba->drba_cred, tx);
+               dsl_dataset_rele(snap, FTAG);
+               dsl_dataset_rele(ds, FTAG);
+       } else {
+               dsl_dir_t *dd;
+               const char *tail;
+               dsl_dataset_t *origin = NULL;
+
+               VERIFY0(dsl_dir_hold(dp, tofs, FTAG, &dd, &tail));
+
+               if (drba->drba_origin != NULL) {
+                       VERIFY0(dsl_dataset_hold(dp, drba->drba_origin,
+                           FTAG, &origin));
+               }
+
+               /* Create new dataset. */
+               dsobj = dsl_dataset_create_sync(dd,
+                   strrchr(tofs, '/') + 1,
+                   origin, crflags, drba->drba_cred, tx);
+               if (origin != NULL)
+                       dsl_dataset_rele(origin, FTAG);
+               dsl_dir_rele(dd, FTAG);
+               drba->drba_cookie->drc_newfs = B_TRUE;
+       }
+       VERIFY0(dsl_dataset_own_obj(dp, dsobj, dmu_recv_tag, &newds));
 
-       /* create and open the temporary clone */
-       dsobj = dsl_dataset_create_sync(ohds->ds_dir, rbsa->clonelastname,
-           ohds->ds_prev, flags, rbsa->cr, tx);
-       VERIFY(0 == dsl_dataset_own_obj(dp, dsobj, B_TRUE, dmu_recv_tag, &cds));
+       dmu_buf_will_dirty(newds->ds_dbuf, tx);
+       dsl_dataset_phys(newds)->ds_flags |= DS_FLAG_INCONSISTENT;
 
        /*
         * If we actually created a non-clone, we need to create the
         * objset in our new dataset.
         */
-       if (BP_IS_HOLE(dsl_dataset_get_blkptr(cds))) {
+       if (BP_IS_HOLE(dsl_dataset_get_blkptr(newds))) {
                (void) dmu_objset_create_impl(dp->dp_spa,
-                   cds, dsl_dataset_get_blkptr(cds), rbsa->type, tx);
+                   newds, dsl_dataset_get_blkptr(newds), drrb->drr_type, tx);
        }
 
-       rbsa->ds = cds;
+       drba->drba_cookie->drc_ds = newds;
 
-       spa_history_log_internal(LOG_DS_REPLAY_INC_SYNC,
-           dp->dp_spa, tx, "dataset = %lld", dsobj);
-}
-
-static boolean_t
-dmu_recv_verify_features(dsl_dataset_t *ds, struct drr_begin *drrb)
-{
-       int featureflags;
-
-       featureflags = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo);
-
-       /* Verify pool version supports SA if SA_SPILL feature set */
-       return ((featureflags & DMU_BACKUP_FEATURE_SA_SPILL) &&
-           (spa_version(dsl_dataset_get_spa(ds)) < SPA_VERSION_SA));
+       spa_history_log_internal_ds(newds, "receive", tx, "");
 }
 
 /*
@@ -777,132 +1147,56 @@ dmu_recv_verify_features(dsl_dataset_t *ds, struct drr_begin *drrb)
  * succeeds; otherwise we will leak the holds on the datasets.
  */
 int
-dmu_recv_begin(char *tofs, char *tosnap, char *top_ds, struct drr_begin *drrb,
-    boolean_t force, objset_t *origin, dmu_recv_cookie_t *drc)
+dmu_recv_begin(char *tofs, char *tosnap, struct drr_begin *drrb,
+    boolean_t force, char *origin, dmu_recv_cookie_t *drc)
 {
-       int err = 0;
-       boolean_t byteswap;
-       struct recvbeginsyncarg rbsa = { 0 };
-       uint64_t versioninfo;
-       int flags;
-       dsl_dataset_t *ds;
-
-       if (drrb->drr_magic == DMU_BACKUP_MAGIC)
-               byteswap = FALSE;
-       else if (drrb->drr_magic == BSWAP_64(DMU_BACKUP_MAGIC))
-               byteswap = TRUE;
-       else
-               return (EINVAL);
-
-       rbsa.tofs = tofs;
-       rbsa.tosnap = tosnap;
-       rbsa.origin = origin ? origin->os_dsl_dataset : NULL;
-       rbsa.fromguid = drrb->drr_fromguid;
-       rbsa.type = drrb->drr_type;
-       rbsa.tag = FTAG;
-       rbsa.dsflags = 0;
-       rbsa.cr = CRED();
-       versioninfo = drrb->drr_versioninfo;
-       flags = drrb->drr_flags;
-
-       if (byteswap) {
-               rbsa.type = BSWAP_32(rbsa.type);
-               rbsa.fromguid = BSWAP_64(rbsa.fromguid);
-               versioninfo = BSWAP_64(versioninfo);
-               flags = BSWAP_32(flags);
-       }
-
-       if (DMU_GET_STREAM_HDRTYPE(versioninfo) == DMU_COMPOUNDSTREAM ||
-           rbsa.type >= DMU_OST_NUMTYPES ||
-           ((flags & DRR_FLAG_CLONE) && origin == NULL))
-               return (EINVAL);
-
-       if (flags & DRR_FLAG_CI_DATA)
-               rbsa.dsflags = DS_FLAG_CI_DATASET;
+       dmu_recv_begin_arg_t drba = { 0 };
+       dmu_replay_record_t *drr;
 
        bzero(drc, sizeof (dmu_recv_cookie_t));
        drc->drc_drrb = drrb;
        drc->drc_tosnap = tosnap;
-       drc->drc_top_ds = top_ds;
+       drc->drc_tofs = tofs;
        drc->drc_force = force;
+       drc->drc_cred = CRED();
 
-       /*
-        * Process the begin in syncing context.
-        */
-
-       /* open the dataset we are logically receiving into */
-       err = dsl_dataset_hold(tofs, dmu_recv_tag, &ds);
-       if (err == 0) {
-               if (dmu_recv_verify_features(ds, drrb)) {
-                       dsl_dataset_rele(ds, dmu_recv_tag);
-                       return (ENOTSUP);
-               }
-               /* target fs already exists; recv into temp clone */
-
-               /* Can't recv a clone into an existing fs */
-               if (flags & DRR_FLAG_CLONE) {
-                       dsl_dataset_rele(ds, dmu_recv_tag);
-                       return (EINVAL);
-               }
-
-               /* must not have an incremental recv already in progress */
-               if (!mutex_tryenter(&ds->ds_recvlock)) {
-                       dsl_dataset_rele(ds, dmu_recv_tag);
-                       return (EBUSY);
-               }
-
-               /* tmp clone name is: tofs/%tosnap" */
-               (void) snprintf(rbsa.clonelastname, sizeof (rbsa.clonelastname),
-                   "%%%s", tosnap);
-               rbsa.force = force;
-               err = dsl_sync_task_do(ds->ds_dir->dd_pool,
-                   recv_existing_check, recv_existing_sync, ds, &rbsa, 5);
-               if (err) {
-                       mutex_exit(&ds->ds_recvlock);
-                       dsl_dataset_rele(ds, dmu_recv_tag);
-                       return (err);
-               }
-               drc->drc_logical_ds = ds;
-               drc->drc_real_ds = rbsa.ds;
-       } else if (err == ENOENT) {
-               /* target fs does not exist; must be a full backup or clone */
-               char *cp;
+       if (drrb->drr_magic == BSWAP_64(DMU_BACKUP_MAGIC))
+               drc->drc_byteswap = B_TRUE;
+       else if (drrb->drr_magic != DMU_BACKUP_MAGIC)
+               return (SET_ERROR(EINVAL));
 
-               /*
-                * If it's a non-clone incremental, we are missing the
-                * target fs, so fail the recv.
-                */
-               if (rbsa.fromguid && !(flags & DRR_FLAG_CLONE))
-                       return (ENOENT);
-
-               /* Open the parent of tofs */
-               cp = strrchr(tofs, '/');
-               *cp = '\0';
-               err = dsl_dataset_hold(tofs, FTAG, &ds);
-               *cp = '/';
-               if (err)
-                       return (err);
-
-               if (dmu_recv_verify_features(ds, drrb)) {
-                       dsl_dataset_rele(ds, FTAG);
-                       return (ENOTSUP);
-               }
+       drr = kmem_zalloc(sizeof (dmu_replay_record_t), KM_SLEEP);
+       drr->drr_type = DRR_BEGIN;
+       drr->drr_u.drr_begin = *drc->drc_drrb;
+       if (drc->drc_byteswap) {
+               fletcher_4_incremental_byteswap(drr,
+                   sizeof (dmu_replay_record_t), &drc->drc_cksum);
+       } else {
+               fletcher_4_incremental_native(drr,
+                   sizeof (dmu_replay_record_t), &drc->drc_cksum);
+       }
+       kmem_free(drr, sizeof (dmu_replay_record_t));
 
-               err = dsl_sync_task_do(ds->ds_dir->dd_pool,
-                   recv_new_check, recv_new_sync, ds->ds_dir, &rbsa, 5);
-               dsl_dataset_rele(ds, FTAG);
-               if (err)
-                       return (err);
-               drc->drc_logical_ds = drc->drc_real_ds = rbsa.ds;
-               drc->drc_newfs = B_TRUE;
+       if (drc->drc_byteswap) {
+               drrb->drr_magic = BSWAP_64(drrb->drr_magic);
+               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_toguid = BSWAP_64(drrb->drr_toguid);
+               drrb->drr_fromguid = BSWAP_64(drrb->drr_fromguid);
        }
 
-       return (err);
+       drba.drba_origin = origin;
+       drba.drba_cookie = drc;
+       drba.drba_cred = CRED();
+
+       return (dsl_sync_task(tofs, dmu_recv_begin_check, dmu_recv_begin_sync,
+           &drba, 5));
 }
 
 struct restorearg {
        int err;
-       int byteswap;
+       boolean_t byteswap;
        vnode_t *vp;
        char *buf;
        uint64_t voff;
@@ -938,7 +1232,8 @@ free_guid_map_onexit(void *arg)
        guid_map_entry_t *gmep;
 
        while ((gmep = avl_destroy_nodes(ca, &cookie)) != NULL) {
-               dsl_dataset_rele(gmep->gme_ds, ca);
+               dsl_dataset_long_rele(gmep->gme_ds, gmep);
+               dsl_dataset_rele(gmep->gme_ds, gmep);
                kmem_free(gmep, sizeof (guid_map_entry_t));
        }
        avl_destroy(ca);
@@ -946,37 +1241,38 @@ free_guid_map_onexit(void *arg)
 }
 
 static void *
-restore_read(struct restorearg *ra, int len)
+restore_read(struct restorearg *ra, int len, char *buf)
 {
-       void *rv;
        int done = 0;
 
+       if (buf == NULL)
+               buf = ra->buf;
+
        /* some things will require 8-byte alignment, so everything must */
-       ASSERT3U(len % 8, ==, 0);
+       ASSERT0(len % 8);
 
        while (done < len) {
                ssize_t resid;
 
                ra->err = vn_rdwr(UIO_READ, ra->vp,
-                   (caddr_t)ra->buf + done, len - done,
+                   buf + done, len - done,
                    ra->voff, UIO_SYSSPACE, FAPPEND,
                    RLIM64_INFINITY, CRED(), &resid);
 
                if (resid == len - done)
-                       ra->err = EINVAL;
+                       ra->err = SET_ERROR(EINVAL);
                ra->voff += len - done - resid;
                done = len - resid;
-               if (ra->err)
+               if (ra->err != 0)
                        return (NULL);
        }
 
        ASSERT3U(done, ==, len);
-       rv = ra->buf;
        if (ra->byteswap)
-               fletcher_4_incremental_byteswap(rv, len, &ra->cksum);
+               fletcher_4_incremental_byteswap(buf, len, &ra->cksum);
        else
-               fletcher_4_incremental_native(rv, len, &ra->cksum);
-       return (rv);
+               fletcher_4_incremental_native(buf, len, &ra->cksum);
+       return (buf);
 }
 
 noinline static void
@@ -998,7 +1294,6 @@ backup_byteswap(dmu_replay_record_t *drr)
                break;
        case DRR_OBJECT:
                DO64(drr_object.drr_object);
-               /* DO64(drr_object.drr_allocation_txg); */
                DO32(drr_object.drr_type);
                DO32(drr_object.drr_bonustype);
                DO32(drr_object.drr_blksz);
@@ -1036,6 +1331,14 @@ backup_byteswap(dmu_replay_record_t *drr)
                DO64(drr_write_byref.drr_key.ddk_cksum.zc_word[3]);
                DO64(drr_write_byref.drr_key.ddk_prop);
                break;
+       case DRR_WRITE_EMBEDDED:
+               DO64(drr_write_embedded.drr_object);
+               DO64(drr_write_embedded.drr_offset);
+               DO64(drr_write_embedded.drr_length);
+               DO64(drr_write_embedded.drr_toguid);
+               DO32(drr_write_embedded.drr_lsize);
+               DO32(drr_write_embedded.drr_psize);
+               break;
        case DRR_FREE:
                DO64(drr_free.drr_object);
                DO64(drr_free.drr_offset);
@@ -1061,67 +1364,97 @@ backup_byteswap(dmu_replay_record_t *drr)
 #undef DO32
 }
 
+static inline uint8_t
+deduce_nblkptr(dmu_object_type_t bonus_type, uint64_t bonus_size)
+{
+       if (bonus_type == DMU_OT_SA) {
+               return (1);
+       } else {
+               return (1 +
+                   ((DN_MAX_BONUSLEN - bonus_size) >> SPA_BLKPTRSHIFT));
+       }
+}
+
 noinline static int
 restore_object(struct restorearg *ra, objset_t *os, struct drr_object *drro)
 {
-       int err;
+       dmu_object_info_t doi;
        dmu_tx_t *tx;
        void *data = NULL;
+       uint64_t object;
+       int err;
 
        if (drro->drr_type == DMU_OT_NONE ||
-           drro->drr_type >= DMU_OT_NUMTYPES ||
-           drro->drr_bonustype >= DMU_OT_NUMTYPES ||
+           !DMU_OT_IS_VALID(drro->drr_type) ||
+           !DMU_OT_IS_VALID(drro->drr_bonustype) ||
            drro->drr_checksumtype >= ZIO_CHECKSUM_FUNCTIONS ||
            drro->drr_compress >= ZIO_COMPRESS_FUNCTIONS ||
            P2PHASE(drro->drr_blksz, SPA_MINBLOCKSIZE) ||
            drro->drr_blksz < SPA_MINBLOCKSIZE ||
            drro->drr_blksz > SPA_MAXBLOCKSIZE ||
            drro->drr_bonuslen > DN_MAX_BONUSLEN) {
-               return (EINVAL);
+               return (SET_ERROR(EINVAL));
        }
 
-       err = dmu_object_info(os, drro->drr_object, NULL);
+       err = dmu_object_info(os, drro->drr_object, &doi);
 
        if (err != 0 && err != ENOENT)
-               return (EINVAL);
+               return (SET_ERROR(EINVAL));
+       object = err == 0 ? drro->drr_object : DMU_NEW_OBJECT;
 
        if (drro->drr_bonuslen) {
-               data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8));
-               if (ra->err)
+               data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8), NULL);
+               if (ra->err != 0)
                        return (ra->err);
        }
 
-       if (err == ENOENT) {
-               /* currently free, want to be allocated */
-               tx = dmu_tx_create(os);
-               dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT);
-               err = dmu_tx_assign(tx, TXG_WAIT);
-               if (err) {
-                       dmu_tx_abort(tx);
-                       return (err);
+       /*
+        * If we are losing blkptrs or changing the block size this must
+        * be a new file instance.  We must clear out the previous file
+        * contents before we can change this type of metadata in the dnode.
+        */
+       if (err == 0) {
+               int nblkptr;
+
+               nblkptr = deduce_nblkptr(drro->drr_bonustype,
+                   drro->drr_bonuslen);
+
+               if (drro->drr_blksz != doi.doi_data_block_size ||
+                   nblkptr < doi.doi_nblkptr) {
+                       err = dmu_free_long_range(os, drro->drr_object,
+                           0, DMU_OBJECT_END);
+                       if (err != 0)
+                               return (SET_ERROR(EINVAL));
                }
-               err = dmu_object_claim(os, drro->drr_object,
-                   drro->drr_type, drro->drr_blksz,
-                   drro->drr_bonustype, drro->drr_bonuslen, tx);
-               dmu_tx_commit(tx);
-       } else {
-               /* currently allocated, want to be allocated */
-               err = dmu_object_reclaim(os, drro->drr_object,
-                   drro->drr_type, drro->drr_blksz,
-                   drro->drr_bonustype, drro->drr_bonuslen);
-       }
-       if (err) {
-               return (EINVAL);
        }
 
        tx = dmu_tx_create(os);
-       dmu_tx_hold_bonus(tx, drro->drr_object);
+       dmu_tx_hold_bonus(tx, object);
        err = dmu_tx_assign(tx, TXG_WAIT);
-       if (err) {
+       if (err != 0) {
                dmu_tx_abort(tx);
                return (err);
        }
 
+       if (object == DMU_NEW_OBJECT) {
+               /* currently free, want to be allocated */
+               err = dmu_object_claim(os, drro->drr_object,
+                   drro->drr_type, drro->drr_blksz,
+                   drro->drr_bonustype, drro->drr_bonuslen, tx);
+       } else if (drro->drr_type != doi.doi_type ||
+           drro->drr_blksz != doi.doi_data_block_size ||
+           drro->drr_bonustype != doi.doi_bonus_type ||
+           drro->drr_bonuslen != doi.doi_bonus_size) {
+               /* currently allocated, but with different properties */
+               err = dmu_object_reclaim(os, drro->drr_object,
+                   drro->drr_type, drro->drr_blksz,
+                   drro->drr_bonustype, drro->drr_bonuslen, tx);
+       }
+       if (err != 0) {
+               dmu_tx_commit(tx);
+               return (SET_ERROR(EINVAL));
+       }
+
        dmu_object_set_checksum(os, drro->drr_object, drro->drr_checksumtype,
            tx);
        dmu_object_set_compress(os, drro->drr_object, drro->drr_compress, tx);
@@ -1135,7 +1468,9 @@ restore_object(struct restorearg *ra, objset_t *os, struct drr_object *drro)
                ASSERT3U(db->db_size, >=, drro->drr_bonuslen);
                bcopy(data, db->db_data, drro->drr_bonuslen);
                if (ra->byteswap) {
-                       dmu_ot[drro->drr_bonustype].ot_byteswap(db->db_data,
+                       dmu_object_byteswap_t byteswap =
+                           DMU_OT_BYTESWAP(drro->drr_bonustype);
+                       dmu_ot_byteswap[byteswap].ob_func(db->db_data,
                            drro->drr_bonuslen);
                }
                dmu_buf_rele(db, FTAG);
@@ -1152,7 +1487,7 @@ restore_freeobjects(struct restorearg *ra, objset_t *os,
        uint64_t obj;
 
        if (drrfo->drr_firstobj + drrfo->drr_numobjs < drrfo->drr_firstobj)
-               return (EINVAL);
+               return (SET_ERROR(EINVAL));
 
        for (obj = drrfo->drr_firstobj;
            obj < drrfo->drr_firstobj + drrfo->drr_numobjs;
@@ -1162,8 +1497,8 @@ restore_freeobjects(struct restorearg *ra, objset_t *os,
                if (dmu_object_info(os, obj, NULL) != 0)
                        continue;
 
-               err = dmu_free_object(os, obj);
-               if (err)
+               err = dmu_free_long_object(os, obj);
+               if (err != 0)
                        return (err);
        }
        return (0);
@@ -1174,34 +1509,49 @@ restore_write(struct restorearg *ra, objset_t *os,
     struct drr_write *drrw)
 {
        dmu_tx_t *tx;
+       dmu_buf_t *bonus;
+       arc_buf_t *abuf;
        void *data;
        int err;
 
        if (drrw->drr_offset + drrw->drr_length < drrw->drr_offset ||
-           drrw->drr_type >= DMU_OT_NUMTYPES)
-               return (EINVAL);
-
-       data = restore_read(ra, drrw->drr_length);
-       if (data == NULL)
-               return (ra->err);
+           !DMU_OT_IS_VALID(drrw->drr_type))
+               return (SET_ERROR(EINVAL));
 
        if (dmu_object_info(os, drrw->drr_object, NULL) != 0)
-               return (EINVAL);
+               return (SET_ERROR(EINVAL));
+
+       if (dmu_bonus_hold(os, drrw->drr_object, FTAG, &bonus) != 0)
+               return (SET_ERROR(EINVAL));
+
+       abuf = dmu_request_arcbuf(bonus, drrw->drr_length);
+
+       data = restore_read(ra, drrw->drr_length, abuf->b_data);
+       if (data == NULL) {
+               dmu_return_arcbuf(abuf);
+               dmu_buf_rele(bonus, FTAG);
+               return (ra->err);
+       }
 
        tx = dmu_tx_create(os);
 
        dmu_tx_hold_write(tx, drrw->drr_object,
            drrw->drr_offset, drrw->drr_length);
        err = dmu_tx_assign(tx, TXG_WAIT);
-       if (err) {
+       if (err != 0) {
+               dmu_return_arcbuf(abuf);
+               dmu_buf_rele(bonus, FTAG);
                dmu_tx_abort(tx);
                return (err);
        }
-       if (ra->byteswap)
-               dmu_ot[drrw->drr_type].ot_byteswap(data, drrw->drr_length);
-       dmu_write(os, drrw->drr_object,
-           drrw->drr_offset, drrw->drr_length, data, tx);
+       if (ra->byteswap) {
+               dmu_object_byteswap_t byteswap =
+                   DMU_OT_BYTESWAP(drrw->drr_type);
+               dmu_ot_byteswap[byteswap].ob_func(data, drrw->drr_length);
+       }
+       dmu_assign_arcbuf(bonus, drrw->drr_offset, abuf, tx);
        dmu_tx_commit(tx);
+       dmu_buf_rele(bonus, FTAG);
        return (0);
 }
 
@@ -1220,12 +1570,12 @@ restore_write_byref(struct restorearg *ra, objset_t *os,
        int err;
        guid_map_entry_t gmesrch;
        guid_map_entry_t *gmep;
-       avl_index_t     where;
+       avl_index_t where;
        objset_t *ref_os = NULL;
        dmu_buf_t *dbp;
 
        if (drrwbr->drr_offset + drrwbr->drr_length < drrwbr->drr_offset)
-               return (EINVAL);
+               return (SET_ERROR(EINVAL));
 
        /*
         * If the GUID of the referenced dataset is different from the
@@ -1235,17 +1585,17 @@ restore_write_byref(struct restorearg *ra, objset_t *os,
                gmesrch.guid = drrwbr->drr_refguid;
                if ((gmep = avl_find(ra->guid_to_ds_map, &gmesrch,
                    &where)) == NULL) {
-                       return (EINVAL);
+                       return (SET_ERROR(EINVAL));
                }
                if (dmu_objset_from_ds(gmep->gme_ds, &ref_os))
-                       return (EINVAL);
+                       return (SET_ERROR(EINVAL));
        } else {
                ref_os = os;
        }
 
        err = dmu_buf_hold(ref_os, drrwbr->drr_refobject,
            drrwbr->drr_refoffset, FTAG, &dbp, DMU_READ_PREFETCH);
-       if (err)
+       if (err != 0)
                return (err);
 
        tx = dmu_tx_create(os);
@@ -1253,7 +1603,7 @@ restore_write_byref(struct restorearg *ra, objset_t *os,
        dmu_tx_hold_write(tx, drrwbr->drr_object,
            drrwbr->drr_offset, drrwbr->drr_length);
        err = dmu_tx_assign(tx, TXG_WAIT);
-       if (err) {
+       if (err != 0) {
                dmu_tx_abort(tx);
                return (err);
        }
@@ -1264,6 +1614,48 @@ restore_write_byref(struct restorearg *ra, objset_t *os,
        return (0);
 }
 
+static int
+restore_write_embedded(struct restorearg *ra, objset_t *os,
+    struct drr_write_embedded *drrwnp)
+{
+       dmu_tx_t *tx;
+       int err;
+       void *data;
+
+       if (drrwnp->drr_offset + drrwnp->drr_length < drrwnp->drr_offset)
+               return (EINVAL);
+
+       if (drrwnp->drr_psize > BPE_PAYLOAD_SIZE)
+               return (EINVAL);
+
+       if (drrwnp->drr_etype >= NUM_BP_EMBEDDED_TYPES)
+               return (EINVAL);
+       if (drrwnp->drr_compression >= ZIO_COMPRESS_FUNCTIONS)
+               return (EINVAL);
+
+       data = restore_read(ra, P2ROUNDUP(drrwnp->drr_psize, 8), NULL);
+       if (data == NULL)
+               return (ra->err);
+
+       tx = dmu_tx_create(os);
+
+       dmu_tx_hold_write(tx, drrwnp->drr_object,
+           drrwnp->drr_offset, drrwnp->drr_length);
+       err = dmu_tx_assign(tx, TXG_WAIT);
+       if (err != 0) {
+               dmu_tx_abort(tx);
+               return (err);
+       }
+
+       dmu_write_embedded(os, drrwnp->drr_object,
+           drrwnp->drr_offset, data, drrwnp->drr_etype,
+           drrwnp->drr_compression, drrwnp->drr_lsize, drrwnp->drr_psize,
+           ra->byteswap ^ ZFS_HOST_BYTEORDER, tx);
+
+       dmu_tx_commit(tx);
+       return (0);
+}
+
 static int
 restore_spill(struct restorearg *ra, objset_t *os, struct drr_spill *drrs)
 {
@@ -1274,14 +1666,14 @@ restore_spill(struct restorearg *ra, objset_t *os, struct drr_spill *drrs)
 
        if (drrs->drr_length < SPA_MINBLOCKSIZE ||
            drrs->drr_length > SPA_MAXBLOCKSIZE)
-               return (EINVAL);
+               return (SET_ERROR(EINVAL));
 
-       data = restore_read(ra, drrs->drr_length);
+       data = restore_read(ra, drrs->drr_length, NULL);
        if (data == NULL)
                return (ra->err);
 
        if (dmu_object_info(os, drrs->drr_object, NULL) != 0)
-               return (EINVAL);
+               return (SET_ERROR(EINVAL));
 
        VERIFY(0 == dmu_bonus_hold(os, drrs->drr_object, FTAG, &db));
        if ((err = dmu_spill_hold_by_bonus(db, FTAG, &db_spill)) != 0) {
@@ -1294,7 +1686,7 @@ restore_spill(struct restorearg *ra, objset_t *os, struct drr_spill *drrs)
        dmu_tx_hold_spill(tx, db->db_object);
 
        err = dmu_tx_assign(tx, TXG_WAIT);
-       if (err) {
+       if (err != 0) {
                dmu_buf_rele(db, FTAG);
                dmu_buf_rele(db_spill, FTAG);
                dmu_tx_abort(tx);
@@ -1323,16 +1715,26 @@ restore_free(struct restorearg *ra, objset_t *os,
 
        if (drrf->drr_length != -1ULL &&
            drrf->drr_offset + drrf->drr_length < drrf->drr_offset)
-               return (EINVAL);
+               return (SET_ERROR(EINVAL));
 
        if (dmu_object_info(os, drrf->drr_object, NULL) != 0)
-               return (EINVAL);
+               return (SET_ERROR(EINVAL));
 
        err = dmu_free_long_range(os, drrf->drr_object,
            drrf->drr_offset, drrf->drr_length);
        return (err);
 }
 
+/* used to destroy the drc_ds on error */
+static void
+dmu_recv_cleanup_ds(dmu_recv_cookie_t *drc)
+{
+       char name[MAXNAMELEN];
+       dsl_dataset_name(drc->drc_ds, name);
+       dsl_dataset_disown(drc->drc_ds, dmu_recv_tag);
+       (void) dsl_destroy_head(name);
+}
+
 /*
  * NB: callers *must* call dmu_recv_end() if this succeeds.
  */
@@ -1346,52 +1748,24 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, vnode_t *vp, offset_t *voffp,
        zio_cksum_t pcksum;
        int featureflags;
 
-       if (drc->drc_drrb->drr_magic == BSWAP_64(DMU_BACKUP_MAGIC))
-               ra.byteswap = TRUE;
-
-       {
-               /* compute checksum of drr_begin record */
-               dmu_replay_record_t *drr;
-               drr = kmem_zalloc(sizeof (dmu_replay_record_t), KM_SLEEP);
-
-               drr->drr_type = DRR_BEGIN;
-               drr->drr_u.drr_begin = *drc->drc_drrb;
-               if (ra.byteswap) {
-                       fletcher_4_incremental_byteswap(drr,
-                           sizeof (dmu_replay_record_t), &ra.cksum);
-               } else {
-                       fletcher_4_incremental_native(drr,
-                           sizeof (dmu_replay_record_t), &ra.cksum);
-               }
-               kmem_free(drr, sizeof (dmu_replay_record_t));
-       }
-
-       if (ra.byteswap) {
-               struct drr_begin *drrb = drc->drc_drrb;
-               drrb->drr_magic = BSWAP_64(drrb->drr_magic);
-               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_toguid = BSWAP_64(drrb->drr_toguid);
-               drrb->drr_fromguid = BSWAP_64(drrb->drr_fromguid);
-       }
-
+       ra.byteswap = drc->drc_byteswap;
+       ra.cksum = drc->drc_cksum;
        ra.vp = vp;
        ra.voff = *voffp;
        ra.bufsize = 1<<20;
        ra.buf = vmem_alloc(ra.bufsize, KM_SLEEP);
 
        /* these were verified in dmu_recv_begin */
-       ASSERT(DMU_GET_STREAM_HDRTYPE(drc->drc_drrb->drr_versioninfo) ==
+       ASSERT3U(DMU_GET_STREAM_HDRTYPE(drc->drc_drrb->drr_versioninfo), ==,
            DMU_SUBSTREAM);
-       ASSERT(drc->drc_drrb->drr_type < DMU_OST_NUMTYPES);
+       ASSERT3U(drc->drc_drrb->drr_type, <, DMU_OST_NUMTYPES);
 
        /*
         * Open the objset we are modifying.
         */
-       VERIFY(dmu_objset_from_ds(drc->drc_real_ds, &os) == 0);
+       VERIFY0(dmu_objset_from_ds(drc->drc_ds, &os));
 
-       ASSERT(drc->drc_real_ds->ds_phys->ds_flags & DS_FLAG_INCONSISTENT);
+       ASSERT(dsl_dataset_phys(drc->drc_ds)->ds_flags & DS_FLAG_INCONSISTENT);
 
        featureflags = DMU_GET_FEATUREFLAGS(drc->drc_drrb->drr_versioninfo);
 
@@ -1400,11 +1774,11 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, vnode_t *vp, offset_t *voffp,
                minor_t minor;
 
                if (cleanup_fd == -1) {
-                       ra.err = EBADF;
+                       ra.err = SET_ERROR(EBADF);
                        goto out;
                }
                ra.err = zfs_onexit_fd_hold(cleanup_fd, &minor);
-               if (ra.err) {
+               if (ra.err != 0) {
                        cleanup_fd = -1;
                        goto out;
                }
@@ -1418,12 +1792,12 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, vnode_t *vp, offset_t *voffp,
                        ra.err = zfs_onexit_add_cb(minor,
                            free_guid_map_onexit, ra.guid_to_ds_map,
                            action_handlep);
-                       if (ra.err)
+                       if (ra.err != 0)
                                goto out;
                } else {
                        ra.err = zfs_onexit_cb_data(minor, *action_handlep,
                            (void **)&ra.guid_to_ds_map);
-                       if (ra.err)
+                       if (ra.err != 0)
                                goto out;
                }
 
@@ -1435,9 +1809,9 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, vnode_t *vp, offset_t *voffp,
         */
        pcksum = ra.cksum;
        while (ra.err == 0 &&
-           NULL != (drr = restore_read(&ra, sizeof (*drr)))) {
+           NULL != (drr = restore_read(&ra, sizeof (*drr), NULL))) {
                if (issig(JUSTLOOKING) && issig(FORREAL)) {
-                       ra.err = EINTR;
+                       ra.err = SET_ERROR(EINTR);
                        goto out;
                }
 
@@ -1476,6 +1850,13 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, vnode_t *vp, offset_t *voffp,
                        ra.err = restore_write_byref(&ra, os, &drrwbr);
                        break;
                }
+               case DRR_WRITE_EMBEDDED:
+               {
+                       struct drr_write_embedded drrwe =
+                           drr->drr_u.drr_write_embedded;
+                       ra.err = restore_write_embedded(&ra, os, &drrwe);
+                       break;
+               }
                case DRR_FREE:
                {
                        struct drr_free drrf = drr->drr_u.drr_free;
@@ -1491,7 +1872,7 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, vnode_t *vp, offset_t *voffp,
                         * everything before the DRR_END record.
                         */
                        if (!ZIO_CHECKSUM_EQUAL(drre.drr_checksum, pcksum))
-                               ra.err = ECKSUM;
+                               ra.err = SET_ERROR(ECKSUM);
                        goto out;
                }
                case DRR_SPILL:
@@ -1501,7 +1882,7 @@ dmu_recv_stream(dmu_recv_cookie_t *drc, vnode_t *vp, offset_t *voffp,
                        break;
                }
                default:
-                       ra.err = EINVAL;
+                       ra.err = SET_ERROR(EINVAL);
                        goto out;
                }
                pcksum = ra.cksum;
@@ -1517,14 +1898,7 @@ out:
                 * destroy what we created, so we don't leave it in the
                 * inconsistent restoring state.
                 */
-               txg_wait_synced(drc->drc_real_ds->ds_dir->dd_pool, 0);
-
-               (void) dsl_dataset_destroy(drc->drc_real_ds, dmu_recv_tag,
-                   B_FALSE);
-               if (drc->drc_real_ds != drc->drc_logical_ds) {
-                       mutex_exit(&drc->drc_logical_ds->ds_recvlock);
-                       dsl_dataset_rele(drc->drc_logical_ds, dmu_recv_tag);
-               }
+               dmu_recv_cleanup_ds(drc);
        }
 
        vmem_free(ra.buf, ra.bufsize);
@@ -1532,148 +1906,256 @@ out:
        return (ra.err);
 }
 
-struct recvendsyncarg {
-       char *tosnap;
-       uint64_t creation_time;
-       uint64_t toguid;
-};
-
 static int
-recv_end_check(void *arg1, void *arg2, dmu_tx_t *tx)
+dmu_recv_end_check(void *arg, dmu_tx_t *tx)
 {
-       dsl_dataset_t *ds = arg1;
-       struct recvendsyncarg *resa = arg2;
+       dmu_recv_cookie_t *drc = arg;
+       dsl_pool_t *dp = dmu_tx_pool(tx);
+       int error;
+
+       ASSERT3P(drc->drc_ds->ds_owner, ==, dmu_recv_tag);
+
+       if (!drc->drc_newfs) {
+               dsl_dataset_t *origin_head;
+
+               error = dsl_dataset_hold(dp, drc->drc_tofs, FTAG, &origin_head);
+               if (error != 0)
+                       return (error);
+               if (drc->drc_force) {
+                       /*
+                        * We will destroy any snapshots in tofs (i.e. before
+                        * origin_head) that are after the origin (which is
+                        * the snap before drc_ds, because drc_ds can not
+                        * have any snaps of its own).
+                        */
+                       uint64_t obj;
+
+                       obj = dsl_dataset_phys(origin_head)->ds_prev_snap_obj;
+                       while (obj !=
+                           dsl_dataset_phys(drc->drc_ds)->ds_prev_snap_obj) {
+                               dsl_dataset_t *snap;
+                               error = dsl_dataset_hold_obj(dp, obj, FTAG,
+                                   &snap);
+                               if (error != 0)
+                                       return (error);
+                               if (snap->ds_dir != origin_head->ds_dir)
+                                       error = SET_ERROR(EINVAL);
+                               if (error == 0)  {
+                                       error = dsl_destroy_snapshot_check_impl(
+                                           snap, B_FALSE);
+                               }
+                               obj = dsl_dataset_phys(snap)->ds_prev_snap_obj;
+                               dsl_dataset_rele(snap, FTAG);
+                               if (error != 0)
+                                       return (error);
+                       }
+               }
+               error = dsl_dataset_clone_swap_check_impl(drc->drc_ds,
+                   origin_head, drc->drc_force, drc->drc_owner, tx);
+               if (error != 0) {
+                       dsl_dataset_rele(origin_head, FTAG);
+                       return (error);
+               }
+               error = dsl_dataset_snapshot_check_impl(origin_head,
+                   drc->drc_tosnap, tx, B_TRUE, 1, drc->drc_cred);
+               dsl_dataset_rele(origin_head, FTAG);
+               if (error != 0)
+                       return (error);
 
-       return (dsl_dataset_snapshot_check(ds, resa->tosnap, tx));
+               error = dsl_destroy_head_check_impl(drc->drc_ds, 1);
+       } else {
+               error = dsl_dataset_snapshot_check_impl(drc->drc_ds,
+                   drc->drc_tosnap, tx, B_TRUE, 1, drc->drc_cred);
+       }
+       return (error);
 }
 
 static void
-recv_end_sync(void *arg1, void *arg2, dmu_tx_t *tx)
+dmu_recv_end_sync(void *arg, dmu_tx_t *tx)
 {
-       dsl_dataset_t *ds = arg1;
-       struct recvendsyncarg *resa = arg2;
+       dmu_recv_cookie_t *drc = arg;
+       dsl_pool_t *dp = dmu_tx_pool(tx);
+
+       spa_history_log_internal_ds(drc->drc_ds, "finish receiving",
+           tx, "snap=%s", drc->drc_tosnap);
 
-       dsl_dataset_snapshot_sync(ds, resa->tosnap, tx);
+       if (!drc->drc_newfs) {
+               dsl_dataset_t *origin_head;
 
-       /* set snapshot's creation time and guid */
-       dmu_buf_will_dirty(ds->ds_prev->ds_dbuf, tx);
-       ds->ds_prev->ds_phys->ds_creation_time = resa->creation_time;
-       ds->ds_prev->ds_phys->ds_guid = resa->toguid;
-       ds->ds_prev->ds_phys->ds_flags &= ~DS_FLAG_INCONSISTENT;
+               VERIFY0(dsl_dataset_hold(dp, drc->drc_tofs, FTAG,
+                   &origin_head));
 
-       dmu_buf_will_dirty(ds->ds_dbuf, tx);
-       ds->ds_phys->ds_flags &= ~DS_FLAG_INCONSISTENT;
+               if (drc->drc_force) {
+                       /*
+                        * Destroy any snapshots of drc_tofs (origin_head)
+                        * after the origin (the snap before drc_ds).
+                        */
+                       uint64_t obj;
+
+                       obj = dsl_dataset_phys(origin_head)->ds_prev_snap_obj;
+                       while (obj !=
+                           dsl_dataset_phys(drc->drc_ds)->ds_prev_snap_obj) {
+                               dsl_dataset_t *snap;
+                               VERIFY0(dsl_dataset_hold_obj(dp, obj, FTAG,
+                                   &snap));
+                               ASSERT3P(snap->ds_dir, ==, origin_head->ds_dir);
+                               obj = dsl_dataset_phys(snap)->ds_prev_snap_obj;
+                               dsl_destroy_snapshot_sync_impl(snap,
+                                   B_FALSE, tx);
+                               dsl_dataset_rele(snap, FTAG);
+                       }
+               }
+               VERIFY3P(drc->drc_ds->ds_prev, ==,
+                   origin_head->ds_prev);
+
+               dsl_dataset_clone_swap_sync_impl(drc->drc_ds,
+                   origin_head, tx);
+               dsl_dataset_snapshot_sync_impl(origin_head,
+                   drc->drc_tosnap, tx);
+
+               /* set snapshot's creation time and guid */
+               dmu_buf_will_dirty(origin_head->ds_prev->ds_dbuf, tx);
+               dsl_dataset_phys(origin_head->ds_prev)->ds_creation_time =
+                   drc->drc_drrb->drr_creation_time;
+               dsl_dataset_phys(origin_head->ds_prev)->ds_guid =
+                   drc->drc_drrb->drr_toguid;
+               dsl_dataset_phys(origin_head->ds_prev)->ds_flags &=
+                   ~DS_FLAG_INCONSISTENT;
+
+               dmu_buf_will_dirty(origin_head->ds_dbuf, tx);
+               dsl_dataset_phys(origin_head)->ds_flags &=
+                   ~DS_FLAG_INCONSISTENT;
+
+               dsl_dataset_rele(origin_head, FTAG);
+               dsl_destroy_head_sync_impl(drc->drc_ds, tx);
+
+               if (drc->drc_owner != NULL)
+                       VERIFY3P(origin_head->ds_owner, ==, drc->drc_owner);
+       } else {
+               dsl_dataset_t *ds = drc->drc_ds;
+
+               dsl_dataset_snapshot_sync_impl(ds, drc->drc_tosnap, tx);
+
+               /* set snapshot's creation time and guid */
+               dmu_buf_will_dirty(ds->ds_prev->ds_dbuf, tx);
+               dsl_dataset_phys(ds->ds_prev)->ds_creation_time =
+                   drc->drc_drrb->drr_creation_time;
+               dsl_dataset_phys(ds->ds_prev)->ds_guid =
+                   drc->drc_drrb->drr_toguid;
+               dsl_dataset_phys(ds->ds_prev)->ds_flags &=
+                   ~DS_FLAG_INCONSISTENT;
+
+               dmu_buf_will_dirty(ds->ds_dbuf, tx);
+               dsl_dataset_phys(ds)->ds_flags &= ~DS_FLAG_INCONSISTENT;
+       }
+       drc->drc_newsnapobj = dsl_dataset_phys(drc->drc_ds)->ds_prev_snap_obj;
+       /*
+        * Release the hold from dmu_recv_begin.  This must be done before
+        * we return to open context, so that when we free the dataset's dnode,
+        * we can evict its bonus buffer.
+        */
+       dsl_dataset_disown(drc->drc_ds, dmu_recv_tag);
+       drc->drc_ds = NULL;
 }
 
 static int
-add_ds_to_guidmap(avl_tree_t *guid_map, dsl_dataset_t *ds)
+add_ds_to_guidmap(const char *name, avl_tree_t *guid_map, uint64_t snapobj)
 {
-       dsl_pool_t *dp = ds->ds_dir->dd_pool;
-       uint64_t snapobj = ds->ds_phys->ds_prev_snap_obj;
+       dsl_pool_t *dp;
        dsl_dataset_t *snapds;
        guid_map_entry_t *gmep;
        int err;
 
        ASSERT(guid_map != NULL);
 
-       rw_enter(&dp->dp_config_rwlock, RW_READER);
-       err = dsl_dataset_hold_obj(dp, snapobj, guid_map, &snapds);
+       err = dsl_pool_hold(name, FTAG, &dp);
+       if (err != 0)
+               return (err);
+       gmep = kmem_alloc(sizeof (*gmep), KM_SLEEP);
+       err = dsl_dataset_hold_obj(dp, snapobj, gmep, &snapds);
        if (err == 0) {
-               gmep = kmem_alloc(sizeof (guid_map_entry_t), KM_SLEEP);
-               gmep->guid = snapds->ds_phys->ds_guid;
+               gmep->guid = dsl_dataset_phys(snapds)->ds_guid;
                gmep->gme_ds = snapds;
                avl_add(guid_map, gmep);
+               dsl_dataset_long_hold(snapds, gmep);
+       } else {
+               kmem_free(gmep, sizeof (*gmep));
        }
 
-       rw_exit(&dp->dp_config_rwlock);
+       dsl_pool_rele(dp, FTAG);
        return (err);
 }
 
+static int dmu_recv_end_modified_blocks = 3;
+
 static int
 dmu_recv_existing_end(dmu_recv_cookie_t *drc)
 {
-       struct recvendsyncarg resa;
-       dsl_dataset_t *ds = drc->drc_logical_ds;
-       int err, myerr;
+       int error;
+
+#ifdef _KERNEL
+       char *name;
 
        /*
-        * XXX hack; seems the ds is still dirty and dsl_pool_zil_clean()
-        * expects it to have a ds_user_ptr (and zil), but clone_swap()
-        * can close it.
+        * We will be destroying the ds; make sure its origin is unmounted if
+        * necessary.
         */
-       txg_wait_synced(ds->ds_dir->dd_pool, 0);
-
-       if (dsl_dataset_tryown(ds, FALSE, dmu_recv_tag)) {
-               err = dsl_dataset_clone_swap(drc->drc_real_ds, ds,
-                   drc->drc_force);
-               if (err)
-                       goto out;
-       } else {
-               mutex_exit(&ds->ds_recvlock);
-               dsl_dataset_rele(ds, dmu_recv_tag);
-               (void) dsl_dataset_destroy(drc->drc_real_ds, dmu_recv_tag,
-                   B_FALSE);
-               return (EBUSY);
-       }
-
-       resa.creation_time = drc->drc_drrb->drr_creation_time;
-       resa.toguid = drc->drc_drrb->drr_toguid;
-       resa.tosnap = drc->drc_tosnap;
+       name = kmem_alloc(MAXNAMELEN, KM_SLEEP);
+       dsl_dataset_name(drc->drc_ds, name);
+       zfs_destroy_unmount_origin(name);
+       kmem_free(name, MAXNAMELEN);
+#endif
 
-       err = dsl_sync_task_do(ds->ds_dir->dd_pool,
-           recv_end_check, recv_end_sync, ds, &resa, 3);
-       if (err) {
-               /* swap back */
-               (void) dsl_dataset_clone_swap(drc->drc_real_ds, ds, B_TRUE);
-       }
+       error = dsl_sync_task(drc->drc_tofs,
+           dmu_recv_end_check, dmu_recv_end_sync, drc,
+           dmu_recv_end_modified_blocks);
 
-out:
-       mutex_exit(&ds->ds_recvlock);
-       if (err == 0 && drc->drc_guid_to_ds_map != NULL)
-               (void) add_ds_to_guidmap(drc->drc_guid_to_ds_map, ds);
-       dsl_dataset_disown(ds, dmu_recv_tag);
-       myerr = dsl_dataset_destroy(drc->drc_real_ds, dmu_recv_tag, B_FALSE);
-       ASSERT3U(myerr, ==, 0);
-       return (err);
+       if (error != 0)
+               dmu_recv_cleanup_ds(drc);
+       return (error);
 }
 
 static int
 dmu_recv_new_end(dmu_recv_cookie_t *drc)
 {
-       struct recvendsyncarg resa;
-       dsl_dataset_t *ds = drc->drc_logical_ds;
-       int err;
-
-       /*
-        * XXX hack; seems the ds is still dirty and dsl_pool_zil_clean()
-        * expects it to have a ds_user_ptr (and zil), but clone_swap()
-        * can close it.
-        */
-       txg_wait_synced(ds->ds_dir->dd_pool, 0);
-
-       resa.creation_time = drc->drc_drrb->drr_creation_time;
-       resa.toguid = drc->drc_drrb->drr_toguid;
-       resa.tosnap = drc->drc_tosnap;
-
-       err = dsl_sync_task_do(ds->ds_dir->dd_pool,
-           recv_end_check, recv_end_sync, ds, &resa, 3);
-       if (err) {
-               /* clean up the fs we just recv'd into */
-               (void) dsl_dataset_destroy(ds, dmu_recv_tag, B_FALSE);
-       } else {
-               if (drc->drc_guid_to_ds_map != NULL)
-                       (void) add_ds_to_guidmap(drc->drc_guid_to_ds_map, ds);
-               /* release the hold from dmu_recv_begin */
-               dsl_dataset_disown(ds, dmu_recv_tag);
+       int error;
+
+       error = dsl_sync_task(drc->drc_tofs,
+           dmu_recv_end_check, dmu_recv_end_sync, drc,
+           dmu_recv_end_modified_blocks);
+
+       if (error != 0) {
+               dmu_recv_cleanup_ds(drc);
+       } else if (drc->drc_guid_to_ds_map != NULL) {
+               (void) add_ds_to_guidmap(drc->drc_tofs,
+                   drc->drc_guid_to_ds_map,
+                   drc->drc_newsnapobj);
        }
-       return (err);
+       return (error);
 }
 
 int
-dmu_recv_end(dmu_recv_cookie_t *drc)
+dmu_recv_end(dmu_recv_cookie_t *drc, void *owner)
 {
-       if (drc->drc_logical_ds != drc->drc_real_ds)
-               return (dmu_recv_existing_end(drc));
-       else
+       drc->drc_owner = owner;
+
+       if (drc->drc_newfs)
                return (dmu_recv_new_end(drc));
+       else
+               return (dmu_recv_existing_end(drc));
 }
+
+/*
+ * Return TRUE if this objset is currently being received into.
+ */
+boolean_t
+dmu_objset_is_receiving(objset_t *os)
+{
+       return (os->os_dsl_dataset != NULL &&
+           os->os_dsl_dataset->ds_owner == dmu_recv_tag);
+}
+
+#if defined(_KERNEL)
+module_param(zfs_send_corrupt_data, int, 0644);
+MODULE_PARM_DESC(zfs_send_corrupt_data, "Allow sending corrupt data");
+#endif