Print this page
2882 implement libzfs_core
2883 changing "canmount" property to "on" should not always remount dataset
2900 "zfs snapshot" should be able to create multiple, arbitrary snapshots at once
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Chris Siden <christopher.siden@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Bill Pijewski <wdp@joyent.com>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>

@@ -18,10 +18,11 @@
  *
  * CDDL HEADER END
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
 #include <sys/dmu.h>
 #include <sys/dmu_objset.h>

@@ -700,15 +701,13 @@
                             ZAP_MAXVALUELEN, tbuf, NULL) == 0)
                                 valstr = tbuf;
                 }
         }
 
-        spa_history_log_internal((source == ZPROP_SRC_NONE ||
-            source == ZPROP_SRC_INHERITED) ? LOG_DS_INHERIT :
-            LOG_DS_PROPSET, ds->ds_dir->dd_pool->dp_spa, tx,
-            "%s=%s dataset = %llu", propname,
-            (valstr == NULL ? "" : valstr), ds->ds_object);
+        spa_history_log_internal_ds(ds, (source == ZPROP_SRC_NONE ||
+            source == ZPROP_SRC_INHERITED) ? "inherit" : "set", tx,
+            "%s=%s", propname, (valstr == NULL ? "" : valstr));
 
         if (tbuf != NULL)
                 kmem_free(tbuf, ZAP_MAXVALUELEN);
 }
 

@@ -753,28 +752,10 @@
                 }
                 dsl_prop_set_sync(ds, &psa, tx);
         }
 }
 
-void
-dsl_dir_prop_set_uint64_sync(dsl_dir_t *dd, const char *name, uint64_t val,
-    dmu_tx_t *tx)
-{
-        objset_t *mos = dd->dd_pool->dp_meta_objset;
-        uint64_t zapobj = dd->dd_phys->dd_props_zapobj;
-
-        ASSERT(dmu_tx_is_syncing(tx));
-
-        VERIFY(0 == zap_update(mos, zapobj, name, sizeof (val), 1, &val, tx));
-
-        dsl_prop_changed_notify(dd->dd_pool, dd->dd_object, name, val, TRUE);
-
-        spa_history_log_internal(LOG_DS_PROPSET, dd->dd_pool->dp_spa, tx,
-            "%s=%llu dataset = %llu", name, (u_longlong_t)val,
-            dd->dd_phys->dd_head_dataset_obj);
-}
-
 int
 dsl_prop_set(const char *dsname, const char *propname, zprop_source_t source,
     int intsz, int numints, const void *buf)
 {
         dsl_dataset_t *ds;