diff options
author | delphij <delphij@FreeBSD.org> | 2013-07-30 21:02:09 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2013-07-30 21:02:09 +0000 |
commit | c5affee6a3a59d69c44d3493fa98bec9080bb11f (patch) | |
tree | 23a5763925ca6f88812017c8afbc82918ed35156 /sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c | |
parent | ef92cf9910e5912fe431aaad8b444da2aaae9741 (diff) | |
download | FreeBSD-src-c5affee6a3a59d69c44d3493fa98bec9080bb11f.zip FreeBSD-src-c5affee6a3a59d69c44d3493fa98bec9080bb11f.tar.gz |
MFV r253781 + r253871:
Illumos ZFS issues:
3894 zfs should not allow snapshot of inconsistent dataset
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 | 4 |
1 files changed, 2 insertions, 2 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 d3fd995..5c15009 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 @@ -1608,7 +1608,7 @@ dmu_recv_end_check(void *arg, dmu_tx_t *tx) return (error); } error = dsl_dataset_snapshot_check_impl(origin_head, - drc->drc_tosnap, tx); + drc->drc_tosnap, tx, B_TRUE); dsl_dataset_rele(origin_head, FTAG); if (error != 0) return (error); @@ -1616,7 +1616,7 @@ dmu_recv_end_check(void *arg, dmu_tx_t *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); + drc->drc_tosnap, tx, B_TRUE); } return (error); } |