Illumos 4757, 4913

[mirror_zfs.git] / module / zfs / dsl_destroy.c

diff --git a/module/zfs/dsl_destroy.c b/module/zfs/dsl_destroy.c
index b1fd270dac418439a26033ea60de760f8896e151..dc49fd558c3caa7a5143005d4a6292105e1640a7 100644 (file)
--- a/module/zfs/dsl_destroy.c
+++ b/module/zfs/dsl_destroy.c
@@ -38,6 +38,7 @@
 #include <sys/zfeature.h>
 #include <sys/zfs_ioctl.h>
 #include <sys/dsl_deleg.h>
+#include <sys/dmu_impl.h>
 
 typedef struct dmu_snapshots_destroy_arg {
        nvlist_t *dsda_snaps;
@@ -46,10 +47,7 @@ typedef struct dmu_snapshots_destroy_arg {
        nvlist_t *dsda_errlist;
 } dmu_snapshots_destroy_arg_t;
 
-/*
- * ds must be owned.
- */
-static int
+int
 dsl_destroy_snapshot_check_impl(dsl_dataset_t *ds, boolean_t defer)
 {
        if (!dsl_dataset_is_snapshot(ds))
@@ -129,9 +127,6 @@ dsl_destroy_snapshot_check(void *arg, dmu_tx_t *tx)
        if (pair != NULL)
                return (fnvpair_value_int32(pair));
 
-       if (nvlist_empty(dsda->dsda_successful_snaps))
-               return (SET_ERROR(ENOENT));
-
        return (0);
 }
 
@@ -149,6 +144,8 @@ process_old_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
        struct process_old_arg *poa = arg;
        dsl_pool_t *dp = poa->ds->ds_dir->dd_pool;
 
+       ASSERT(!BP_IS_HOLE(bp));
+
        if (bp->blk_birth <= poa->ds->ds_phys->ds_prev_snap_txg) {
                dsl_deadlist_insert(&poa->ds->ds_deadlist, bp, tx);
                if (poa->ds_prev && !poa->after_branch_point &&
@@ -458,7 +455,7 @@ dsl_destroy_snapshot_sync_impl(dsl_dataset_t *ds, boolean_t defer, dmu_tx_t *tx)
                VERIFY0(zap_destroy(mos, ds->ds_phys->ds_userrefs_obj, tx));
        dsl_dir_rele(ds->ds_dir, ds);
        ds->ds_dir = NULL;
-       VERIFY0(dmu_object_free(mos, obj, tx));
+       dmu_object_free_zapified(mos, obj, tx);
 }
 
 static void
@@ -506,7 +503,8 @@ dsl_destroy_snapshots_nvl(nvlist_t *snaps, boolean_t defer,
                return (0);
 
        dsda.dsda_snaps = snaps;
-        VERIFY0(nvlist_alloc(&dsda.dsda_successful_snaps, NV_UNIQUE_NAME, KM_PUSHPAGE));
+       VERIFY0(nvlist_alloc(&dsda.dsda_successful_snaps,
+           NV_UNIQUE_NAME, KM_PUSHPAGE));
        dsda.dsda_defer = defer;
        dsda.dsda_errlist = errlist;
 
@@ -525,8 +523,8 @@ dsl_destroy_snapshot(const char *name, boolean_t defer)
        nvlist_t *nvl;
        nvlist_t *errlist;
 
-        VERIFY0(nvlist_alloc(&nvl, NV_UNIQUE_NAME, KM_PUSHPAGE));
-        VERIFY0(nvlist_alloc(&errlist, NV_UNIQUE_NAME, KM_PUSHPAGE));
+       VERIFY0(nvlist_alloc(&nvl, NV_UNIQUE_NAME, KM_PUSHPAGE));
+       VERIFY0(nvlist_alloc(&errlist, NV_UNIQUE_NAME, KM_PUSHPAGE));
 
        fnvlist_add_boolean(nvl, name);
        error = dsl_destroy_snapshots_nvl(nvl, defer, errlist);
@@ -548,7 +546,7 @@ kill_blkptr(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
        struct killarg *ka = arg;
        dmu_tx_t *tx = ka->tx;
 
-       if (bp == NULL)
+       if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
                return (0);
 
        if (zb->zb_level == ZB_ZIL_LEVEL) {
@@ -598,6 +596,7 @@ dsl_destroy_head_check_impl(dsl_dataset_t *ds, int expected_holds)
        uint64_t count;
        objset_t *mos;
 
+       ASSERT(!dsl_dataset_is_snapshot(ds));
        if (dsl_dataset_is_snapshot(ds))
                return (SET_ERROR(EINVAL));
 
@@ -684,7 +683,7 @@ dsl_dir_destroy_sync(uint64_t ddobj, dmu_tx_t *tx)
            dd->dd_parent->dd_phys->dd_child_dir_zapobj, dd->dd_myname, tx));
 
        dsl_dir_rele(dd, FTAG);
-       VERIFY0(dmu_object_free(mos, ddobj, tx));
+       dmu_object_free_zapified(mos, ddobj, tx);
 }
 
 void
@@ -694,7 +693,6 @@ dsl_destroy_head_sync_impl(dsl_dataset_t *ds, dmu_tx_t *tx)
        objset_t *mos = dp->dp_meta_objset;
        uint64_t obj, ddobj, prevobj = 0;
        boolean_t rmorigin;
-       zfeature_info_t *async_destroy;
        objset_t *os;
 
        ASSERT3U(ds->ds_phys->ds_num_children, <=, 1);
@@ -711,7 +709,7 @@ dsl_destroy_head_sync_impl(dsl_dataset_t *ds, dmu_tx_t *tx)
            ds->ds_prev->ds_phys->ds_num_children == 2 &&
            ds->ds_prev->ds_userrefs == 0);
 
-       /* Remove our reservation */
+       /* Remove our reservation. */
        if (ds->ds_reserved != 0) {
                dsl_dataset_set_refreservation_sync_impl(ds,
                    (ZPROP_SRC_NONE | ZPROP_SRC_LOCAL | ZPROP_SRC_RECEIVED),
@@ -739,9 +737,6 @@ dsl_destroy_head_sync_impl(dsl_dataset_t *ds, dmu_tx_t *tx)
                ds->ds_prev->ds_phys->ds_num_children--;
        }
 
-       async_destroy =
-           &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY];
-
        /*
         * Destroy the deadlist.  Unless it's a clone, the
         * deadlist should be empty.  (If it's a clone, it's
@@ -754,7 +749,7 @@ dsl_destroy_head_sync_impl(dsl_dataset_t *ds, dmu_tx_t *tx)
 
        VERIFY0(dmu_objset_from_ds(ds, &os));
 
-       if (!spa_feature_is_enabled(dp->dp_spa, async_destroy)) {
+       if (!spa_feature_is_enabled(dp->dp_spa, SPA_FEATURE_ASYNC_DESTROY)) {
                old_synchronous_dataset_destroy(ds, tx);
        } else {
                /*
@@ -765,10 +760,11 @@ dsl_destroy_head_sync_impl(dsl_dataset_t *ds, dmu_tx_t *tx)
 
                zil_destroy_sync(dmu_objset_zil(os), tx);
 
-               if (!spa_feature_is_active(dp->dp_spa, async_destroy)) {
+               if (!spa_feature_is_active(dp->dp_spa,
+                   SPA_FEATURE_ASYNC_DESTROY)) {
                        dsl_scan_t *scn = dp->dp_scan;
-
-                       spa_feature_incr(dp->dp_spa, async_destroy, tx);
+                       spa_feature_incr(dp->dp_spa, SPA_FEATURE_ASYNC_DESTROY,
+                           tx);
                        dp->dp_bptree_obj = bptree_alloc(mos, tx);
                        VERIFY0(zap_add(mos,
                            DMU_POOL_DIRECTORY_OBJECT,
@@ -821,6 +817,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);
@@ -828,7 +830,7 @@ dsl_destroy_head_sync_impl(dsl_dataset_t *ds, dmu_tx_t *tx)
        ASSERT0(ds->ds_phys->ds_userrefs_obj);
        dsl_dir_rele(ds->ds_dir, ds);
        ds->ds_dir = NULL;
-       VERIFY0(dmu_object_free(mos, obj, tx));
+       dmu_object_free_zapified(mos, obj, tx);
 
        dsl_dir_destroy_sync(ddobj, tx);
 
@@ -884,8 +886,7 @@ dsl_destroy_head(const char *name)
        error = spa_open(name, &spa, FTAG);
        if (error != 0)
                return (error);
-       isenabled = spa_feature_is_enabled(spa,
-           &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY]);
+       isenabled = spa_feature_is_enabled(spa, SPA_FEATURE_ASYNC_DESTROY);
        spa_close(spa, FTAG);
 
        ddha.ddha_name = name;
@@ -911,7 +912,7 @@ dsl_destroy_head(const char *name)
                        for (obj = 0; error == 0;
                            error = dmu_object_next(os, &obj, FALSE,
                            prev_snap_txg))
-                               (void) dmu_free_object(os, obj);
+                               (void) dmu_free_long_object(os, obj);
                        /* sync out all frees */
                        txg_wait_synced(dmu_objset_pool(os), 0);
                        dmu_objset_disown(os, FTAG);