diff options
| author | Matthew Ahrens <[email protected]> | 2013-12-11 14:33:41 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-07-29 10:55:29 -0700 |
| commit | da536844d55b2f3aaefdaebd36fb97bb867494aa (patch) | |
| tree | 2b0b5bbad2595189476a8084e24f26e6106bbb4d /module/zfs/dsl_destroy.c | |
| parent | b0bc7a84d90dcbf5321d48c5b24ed771c5a128b0 (diff) | |
Illumos 4368, 4369.
4369 implement zfs bookmarks
4368 zfs send filesystems from readonly pools
Reviewed by: Christopher Siden <[email protected]>
Reviewed by: George Wilson <[email protected]>
Approved by: Garrett D'Amore <[email protected]>
References:
https://www.illumos.org/issues/4369
https://www.illumos.org/issues/4368
https://github.com/illumos/illumos-gate/commit/78f1710
Ported by: Tim Chase <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2530
Diffstat (limited to 'module/zfs/dsl_destroy.c')
| -rw-r--r-- | module/zfs/dsl_destroy.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/module/zfs/dsl_destroy.c b/module/zfs/dsl_destroy.c index cbe89739f..113b7261b 100644 --- a/module/zfs/dsl_destroy.c +++ b/module/zfs/dsl_destroy.c @@ -816,6 +816,12 @@ dsl_destroy_head_sync_impl(dsl_dataset_t *ds, dmu_tx_t *tx) ASSERT(ds->ds_phys->ds_snapnames_zapobj != 0); VERIFY0(zap_destroy(mos, ds->ds_phys->ds_snapnames_zapobj, tx)); + if (ds->ds_bookmarks != 0) { + VERIFY0(zap_destroy(mos, + ds->ds_bookmarks, tx)); + spa_feature_decr(dp->dp_spa, SPA_FEATURE_BOOKMARKS, tx); + } + spa_prop_clear_bootfs(dp->dp_spa, ds->ds_object, tx); ASSERT0(ds->ds_phys->ds_next_clones_obj); |