diff options
| author | mm <mm@FreeBSD.org> | 2012-08-23 19:32:57 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2012-08-23 19:32:57 +0000 |
| commit | 587ce5b6a3a13d38b667f50272fe8ddf80b55acd (patch) | |
| tree | 882f66554bf9020c93c7b164e6b1024effb50186 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c | |
| parent | ba4876bedf0fe5642509d673ed733b6bba39e55a (diff) | |
| download | FreeBSD-src-587ce5b6a3a13d38b667f50272fe8ddf80b55acd.zip FreeBSD-src-587ce5b6a3a13d38b667f50272fe8ddf80b55acd.tar.gz | |
Merge recent vendor changes:
3086 unnecessarily setting DS_FLAG_INCONSISTENT on async destroyed datasets
3090 vdev_reopen() during reguid causes vdev to be treated as corrupt
3102 vdev_uberblock_load() and vdev_validate() may read the wrong label
Referenes:
https://www.illumos.org/issues/3086
https://www.illumos.org/issues/3090
https://www.illumos.org/issues/3102
PR: kern/170912, kern/170914
Obtained from: illumos (changeset #13776, #13777)
MFC after: 2 weeks
Diffstat (limited to 'sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c index 0b8cc62..7f554e5 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c @@ -1649,13 +1649,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); |
