Illumos #3306, #3321

[zfs.git] / module / zfs / dmu_send.c

diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c
index 97c23cb..921c3d7 100644 (file)
--- a/module/zfs/dmu_send.c
+++ b/module/zfs/dmu_send.c
@@ -373,7 +373,7 @@ 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);
                        }
@@ -1609,13 +1609,6 @@ dmu_recv_existing_end(dmu_recv_cookie_t *drc)
        dsl_dataset_t *ds = drc->drc_logical_ds;
        int err, myerr;
 
-       /*
-        * 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);
-
        if (dsl_dataset_tryown(ds, FALSE, dmu_recv_tag)) {
                err = dsl_dataset_clone_swap(drc->drc_real_ds, ds,
                    drc->drc_force);