]> git.proxmox.com Git - mirror_zfs-debian.git/blobdiff - module/zfs/dsl_prop.c
Imported Upstream version 0.6.2+git20140204
[mirror_zfs-debian.git] / module / zfs / dsl_prop.c
index 212acbbc5968848234e0f394c6dc3e483b0717ac..079ef97423bdb23bd085b9fcc8dd9c6ddbb764ee 100644 (file)
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013 Martin Matuska. All rights reserved.
  */
 
-#pragma ident  "%Z%%M% %I%     %E% SMI"
-
+#include <sys/zfs_context.h>
 #include <sys/dmu.h>
 #include <sys/dmu_objset.h>
 #include <sys/dmu_tx.h>
 #include <sys/dsl_prop.h>
 #include <sys/dsl_synctask.h>
 #include <sys/spa.h>
-#include <sys/zio_checksum.h> /* for the default checksum value */
 #include <sys/zap.h>
 #include <sys/fs/zfs.h>
 
 #include "zfs_prop.h"
 
+#define        ZPROP_INHERIT_SUFFIX "$inherit"
+#define        ZPROP_RECVD_SUFFIX "$recvd"
+
 static int
-dodefault(const char *propname, int intsz, int numint, void *buf)
+dodefault(const char *propname, int intsz, int numints, void *buf)
 {
        zfs_prop_t prop;
 
@@ -51,16 +53,16 @@ dodefault(const char *propname, int intsz, int numint, void *buf)
         */
        if ((prop = zfs_name_to_prop(propname)) == ZPROP_INVAL ||
            (zfs_prop_readonly(prop) && !zfs_prop_setonce(prop)))
-               return (ENOENT);
+               return (SET_ERROR(ENOENT));
 
        if (zfs_prop_get_type(prop) == PROP_TYPE_STRING) {
                if (intsz != 1)
-                       return (EOVERFLOW);
+                       return (SET_ERROR(EOVERFLOW));
                (void) strncpy(buf, zfs_prop_default_string(prop),
-                   numint);
+                   numints);
        } else {
-               if (intsz != 8 || numint < 1)
-                       return (EOVERFLOW);
+               if (intsz != 8 || numints < 1)
+                       return (SET_ERROR(EOVERFLOW));
 
                *(uint64_t *)buf = zfs_prop_default_numeric(prop);
        }
@@ -70,63 +72,150 @@ dodefault(const char *propname, int intsz, int numint, void *buf)
 
 int
 dsl_prop_get_dd(dsl_dir_t *dd, const char *propname,
-    int intsz, int numint, void *buf, char *setpoint)
+    int intsz, int numints, void *buf, char *setpoint, boolean_t snapshot)
 {
        int err = ENOENT;
+       dsl_dir_t *target = dd;
        objset_t *mos = dd->dd_pool->dp_meta_objset;
        zfs_prop_t prop;
+       boolean_t inheritable;
+       boolean_t inheriting = B_FALSE;
+       char *inheritstr;
+       char *recvdstr;
 
-       ASSERT(RW_LOCK_HELD(&dd->dd_pool->dp_config_rwlock));
+       ASSERT(dsl_pool_config_held(dd->dd_pool));
 
        if (setpoint)
                setpoint[0] = '\0';
 
        prop = zfs_name_to_prop(propname);
+       inheritable = (prop == ZPROP_INVAL || zfs_prop_inheritable(prop));
+       inheritstr = kmem_asprintf("%s%s", propname, ZPROP_INHERIT_SUFFIX);
+       recvdstr = kmem_asprintf("%s%s", propname, ZPROP_RECVD_SUFFIX);
 
        /*
-        * Note: dd may be NULL, therefore we shouldn't dereference it
-        * ouside this loop.
+        * Note: dd may become NULL, therefore we shouldn't dereference it
+        * after this loop.
         */
        for (; dd != NULL; dd = dd->dd_parent) {
-               ASSERT(RW_LOCK_HELD(&dd->dd_pool->dp_config_rwlock));
-               err = zap_lookup(mos, dd->dd_phys->dd_props_zapobj,
-                   propname, intsz, numint, buf);
+               if (dd != target || snapshot) {
+                       if (!inheritable)
+                               break;
+                       inheriting = B_TRUE;
+               }
+
+               /* Check for a local value. */
+               err = zap_lookup(mos, dd->dd_phys->dd_props_zapobj, propname,
+                   intsz, numints, buf);
                if (err != ENOENT) {
-                       if (setpoint)
+                       if (setpoint != NULL && err == 0)
                                dsl_dir_name(dd, setpoint);
                        break;
                }
 
                /*
-                * Break out of this loop for non-inheritable properties.
+                * Skip the check for a received value if there is an explicit
+                * inheritance entry.
                 */
-               if (prop != ZPROP_INVAL && !zfs_prop_inheritable(prop))
+               err = zap_contains(mos, dd->dd_phys->dd_props_zapobj,
+                   inheritstr);
+               if (err != 0 && err != ENOENT)
                        break;
+
+               if (err == ENOENT) {
+                       /* Check for a received value. */
+                       err = zap_lookup(mos, dd->dd_phys->dd_props_zapobj,
+                           recvdstr, intsz, numints, buf);
+                       if (err != ENOENT) {
+                               if (setpoint != NULL && err == 0) {
+                                       if (inheriting) {
+                                               dsl_dir_name(dd, setpoint);
+                                       } else {
+                                               (void) strcpy(setpoint,
+                                                   ZPROP_SOURCE_VAL_RECVD);
+                                       }
+                               }
+                               break;
+                       }
+               }
+
+               /*
+                * If we found an explicit inheritance entry, err is zero even
+                * though we haven't yet found the value, so reinitializing err
+                * at the end of the loop (instead of at the beginning) ensures
+                * that err has a valid post-loop value.
+                */
+               err = SET_ERROR(ENOENT);
        }
+
        if (err == ENOENT)
-               err = dodefault(propname, intsz, numint, buf);
+               err = dodefault(propname, intsz, numints, buf);
+
+       strfree(inheritstr);
+       strfree(recvdstr);
 
        return (err);
 }
 
 int
 dsl_prop_get_ds(dsl_dataset_t *ds, const char *propname,
-    int intsz, int numint, void *buf, char *setpoint)
+    int intsz, int numints, void *buf, char *setpoint)
 {
-       ASSERT(RW_LOCK_HELD(&ds->ds_dir->dd_pool->dp_config_rwlock));
+       zfs_prop_t prop = zfs_name_to_prop(propname);
+       boolean_t inheritable;
+       boolean_t snapshot;
+       uint64_t zapobj;
+
+       ASSERT(dsl_pool_config_held(ds->ds_dir->dd_pool));
+       inheritable = (prop == ZPROP_INVAL || zfs_prop_inheritable(prop));
+       snapshot = (ds->ds_phys != NULL && dsl_dataset_is_snapshot(ds));
+       zapobj = (ds->ds_phys == NULL ? 0 : ds->ds_phys->ds_props_obj);
+
+       if (zapobj != 0) {
+               objset_t *mos = ds->ds_dir->dd_pool->dp_meta_objset;
+               int err;
+
+               ASSERT(snapshot);
 
-       if (ds->ds_phys->ds_props_obj) {
-               int err = zap_lookup(ds->ds_dir->dd_pool->dp_meta_objset,
-                   ds->ds_phys->ds_props_obj, propname, intsz, numint, buf);
+               /* Check for a local value. */
+               err = zap_lookup(mos, zapobj, propname, intsz, numints, buf);
                if (err != ENOENT) {
-                       if (setpoint)
+                       if (setpoint != NULL && err == 0)
                                dsl_dataset_name(ds, setpoint);
                        return (err);
                }
+
+               /*
+                * Skip the check for a received value if there is an explicit
+                * inheritance entry.
+                */
+               if (inheritable) {
+                       char *inheritstr = kmem_asprintf("%s%s", propname,
+                           ZPROP_INHERIT_SUFFIX);
+                       err = zap_contains(mos, zapobj, inheritstr);
+                       strfree(inheritstr);
+                       if (err != 0 && err != ENOENT)
+                               return (err);
+               }
+
+               if (err == ENOENT) {
+                       /* Check for a received value. */
+                       char *recvdstr = kmem_asprintf("%s%s", propname,
+                           ZPROP_RECVD_SUFFIX);
+                       err = zap_lookup(mos, zapobj, recvdstr,
+                           intsz, numints, buf);
+                       strfree(recvdstr);
+                       if (err != ENOENT) {
+                               if (setpoint != NULL && err == 0)
+                                       (void) strcpy(setpoint,
+                                           ZPROP_SOURCE_VAL_RECVD);
+                               return (err);
+                       }
+               }
        }
 
        return (dsl_prop_get_dd(ds->ds_dir, propname,
-           intsz, numint, buf, setpoint));
+           intsz, numints, buf, setpoint, snapshot));
 }
 
 /*
@@ -141,26 +230,20 @@ dsl_prop_register(dsl_dataset_t *ds, const char *propname,
     dsl_prop_changed_cb_t *callback, void *cbarg)
 {
        dsl_dir_t *dd = ds->ds_dir;
-       dsl_pool_t *dp = dd->dd_pool;
        uint64_t value;
        dsl_prop_cb_record_t *cbr;
        int err;
-       int need_rwlock;
+       ASSERTV(dsl_pool_t *dp = dd->dd_pool);
 
-       need_rwlock = !RW_WRITE_HELD(&dp->dp_config_rwlock);
-       if (need_rwlock)
-               rw_enter(&dp->dp_config_rwlock, RW_READER);
+       ASSERT(dsl_pool_config_held(dp));
 
-       err = dsl_prop_get_ds(ds, propname, 8, 1, &value, NULL);
-       if (err != 0) {
-               if (need_rwlock)
-                       rw_exit(&dp->dp_config_rwlock);
+       err = dsl_prop_get_int_ds(ds, propname, &value);
+       if (err != 0)
                return (err);
-       }
 
-       cbr = kmem_alloc(sizeof (dsl_prop_cb_record_t), KM_SLEEP);
+       cbr = kmem_alloc(sizeof (dsl_prop_cb_record_t), KM_PUSHPAGE);
        cbr->cbr_ds = ds;
-       cbr->cbr_propname = kmem_alloc(strlen(propname)+1, KM_SLEEP);
+       cbr->cbr_propname = kmem_alloc(strlen(propname)+1, KM_PUSHPAGE);
        (void) strcpy((char *)cbr->cbr_propname, propname);
        cbr->cbr_func = callback;
        cbr->cbr_arg = cbarg;
@@ -169,12 +252,6 @@ dsl_prop_register(dsl_dataset_t *ds, const char *propname,
        mutex_exit(&dd->dd_lock);
 
        cbr->cbr_func(cbr->cbr_arg, value);
-
-       VERIFY(0 == dsl_dir_open_obj(dp, dd->dd_object,
-           NULL, cbr, &dd));
-       if (need_rwlock)
-               rw_exit(&dp->dp_config_rwlock);
-       /* Leave dir open until this callback is unregistered */
        return (0);
 }
 
@@ -182,19 +259,18 @@ int
 dsl_prop_get(const char *dsname, const char *propname,
     int intsz, int numints, void *buf, char *setpoint)
 {
-       dsl_dataset_t *ds;
-       int err;
+       objset_t *os;
+       int error;
 
-       err = dsl_dataset_hold(dsname, FTAG, &ds);
-       if (err)
-               return (err);
+       error = dmu_objset_hold(dsname, FTAG, &os);
+       if (error != 0)
+               return (error);
 
-       rw_enter(&ds->ds_dir->dd_pool->dp_config_rwlock, RW_READER);
-       err = dsl_prop_get_ds(ds, propname, intsz, numints, buf, setpoint);
-       rw_exit(&ds->ds_dir->dd_pool->dp_config_rwlock);
+       error = dsl_prop_get_ds(dmu_objset_ds(os), propname,
+           intsz, numints, buf, setpoint);
 
-       dsl_dataset_rele(ds, FTAG);
-       return (err);
+       dmu_objset_rele(os, FTAG);
+       return (error);
 }
 
 /*
@@ -212,9 +288,99 @@ dsl_prop_get_integer(const char *ddname, const char *propname,
        return (dsl_prop_get(ddname, propname, 8, 1, valuep, setpoint));
 }
 
+int
+dsl_prop_get_int_ds(dsl_dataset_t *ds, const char *propname,
+    uint64_t *valuep)
+{
+       return (dsl_prop_get_ds(ds, propname, 8, 1, valuep, NULL));
+}
+
+/*
+ * Predict the effective value of the given special property if it were set with
+ * the given value and source. This is not a general purpose function. It exists
+ * only to handle the special requirements of the quota and reservation
+ * properties. The fact that these properties are non-inheritable greatly
+ * simplifies the prediction logic.
+ *
+ * Returns 0 on success, a positive error code on failure, or -1 if called with
+ * a property not handled by this function.
+ */
+int
+dsl_prop_predict(dsl_dir_t *dd, const char *propname,
+    zprop_source_t source, uint64_t value, uint64_t *newvalp)
+{
+       zfs_prop_t prop = zfs_name_to_prop(propname);
+       objset_t *mos;
+       uint64_t zapobj;
+       uint64_t version;
+       char *recvdstr;
+       int err = 0;
+
+       switch (prop) {
+       case ZFS_PROP_QUOTA:
+       case ZFS_PROP_RESERVATION:
+       case ZFS_PROP_REFQUOTA:
+       case ZFS_PROP_REFRESERVATION:
+               break;
+       default:
+               return (-1);
+       }
+
+       mos = dd->dd_pool->dp_meta_objset;
+       zapobj = dd->dd_phys->dd_props_zapobj;
+       recvdstr = kmem_asprintf("%s%s", propname, ZPROP_RECVD_SUFFIX);
+
+       version = spa_version(dd->dd_pool->dp_spa);
+       if (version < SPA_VERSION_RECVD_PROPS) {
+               if (source & ZPROP_SRC_NONE)
+                       source = ZPROP_SRC_NONE;
+               else if (source & ZPROP_SRC_RECEIVED)
+                       source = ZPROP_SRC_LOCAL;
+       }
+
+       switch ((int)source) {
+       case ZPROP_SRC_NONE:
+               /* Revert to the received value, if any. */
+               err = zap_lookup(mos, zapobj, recvdstr, 8, 1, newvalp);
+               if (err == ENOENT)
+                       *newvalp = 0;
+               break;
+       case ZPROP_SRC_LOCAL:
+               *newvalp = value;
+               break;
+       case ZPROP_SRC_RECEIVED:
+               /*
+                * If there's no local setting, then the new received value will
+                * be the effective value.
+                */
+               err = zap_lookup(mos, zapobj, propname, 8, 1, newvalp);
+               if (err == ENOENT)
+                       *newvalp = value;
+               break;
+       case (ZPROP_SRC_NONE | ZPROP_SRC_RECEIVED):
+               /*
+                * We're clearing the received value, so the local setting (if
+                * it exists) remains the effective value.
+                */
+               err = zap_lookup(mos, zapobj, propname, 8, 1, newvalp);
+               if (err == ENOENT)
+                       *newvalp = 0;
+               break;
+       default:
+               panic("unexpected property source: %d", source);
+       }
+
+       strfree(recvdstr);
+
+       if (err == ENOENT)
+               return (0);
+
+       return (err);
+}
+
 /*
  * Unregister this callback.  Return 0 on success, ENOENT if ddname is
- * invalid, ENOMSG if no matching callback registered.
+ * invalid, or ENOMSG if no matching callback registered.
  */
 int
 dsl_prop_unregister(dsl_dataset_t *ds, const char *propname,
@@ -235,7 +401,7 @@ dsl_prop_unregister(dsl_dataset_t *ds, const char *propname,
 
        if (cbr == NULL) {
                mutex_exit(&dd->dd_lock);
-               return (ENOMSG);
+               return (SET_ERROR(ENOMSG));
        }
 
        list_remove(&dd->dd_prop_cbs, cbr);
@@ -243,30 +409,60 @@ dsl_prop_unregister(dsl_dataset_t *ds, const char *propname,
        kmem_free((void*)cbr->cbr_propname, strlen(cbr->cbr_propname)+1);
        kmem_free(cbr, sizeof (dsl_prop_cb_record_t));
 
-       /* Clean up from dsl_prop_register */
-       dsl_dir_close(dd, cbr);
        return (0);
 }
 
-/*
- * Return the number of callbacks that are registered for this dataset.
- */
-int
-dsl_prop_numcb(dsl_dataset_t *ds)
+boolean_t
+dsl_prop_hascb(dsl_dataset_t *ds)
 {
        dsl_dir_t *dd = ds->ds_dir;
+       boolean_t rv = B_FALSE;
        dsl_prop_cb_record_t *cbr;
-       int num = 0;
 
        mutex_enter(&dd->dd_lock);
-       for (cbr = list_head(&dd->dd_prop_cbs);
-           cbr; cbr = list_next(&dd->dd_prop_cbs, cbr)) {
-               if (cbr->cbr_ds == ds)
-                       num++;
+       for (cbr = list_head(&dd->dd_prop_cbs); cbr;
+           cbr = list_next(&dd->dd_prop_cbs, cbr)) {
+               if (cbr->cbr_ds == ds) {
+                       rv = B_TRUE;
+                       break;
+               }
        }
        mutex_exit(&dd->dd_lock);
+       return (rv);
+}
+
+/* ARGSUSED */
+static int
+dsl_prop_notify_all_cb(dsl_pool_t *dp, dsl_dataset_t *ds, void *arg)
+{
+       dsl_dir_t *dd = ds->ds_dir;
+       dsl_prop_cb_record_t *cbr;
+
+       mutex_enter(&dd->dd_lock);
+       for (cbr = list_head(&dd->dd_prop_cbs); cbr;
+           cbr = list_next(&dd->dd_prop_cbs, cbr)) {
+               uint64_t value;
 
-       return (num);
+               if (dsl_prop_get_ds(cbr->cbr_ds, cbr->cbr_propname,
+                   sizeof (value), 1, &value, NULL) == 0)
+                       cbr->cbr_func(cbr->cbr_arg, value);
+       }
+       mutex_exit(&dd->dd_lock);
+
+       return (0);
+}
+
+/*
+ * Update all property values for ddobj & its descendants.  This is used
+ * when renaming the dir.
+ */
+void
+dsl_prop_notify_all(dsl_dir_t *dd)
+{
+       dsl_pool_t *dp = dd->dd_pool;
+       ASSERT(RRW_WRITE_HELD(&dp->dp_config_rwlock));
+       (void) dmu_objset_find_dp(dp, dd->dd_object, dsl_prop_notify_all_cb,
+           NULL, DS_FIND_CHILDREN);
 }
 
 static void
@@ -279,10 +475,9 @@ dsl_prop_changed_notify(dsl_pool_t *dp, uint64_t ddobj,
        zap_cursor_t zc;
        zap_attribute_t *za;
        int err;
-       uint64_t dummyval;
 
-       ASSERT(RW_WRITE_HELD(&dp->dp_config_rwlock));
-       err = dsl_dir_open_obj(dp, ddobj, NULL, FTAG, &dd);
+       ASSERT(RRW_WRITE_HELD(&dp->dp_config_rwlock));
+       err = dsl_dir_hold_obj(dp, ddobj, NULL, FTAG, &dd);
        if (err)
                return;
 
@@ -291,10 +486,9 @@ dsl_prop_changed_notify(dsl_pool_t *dp, uint64_t ddobj,
                 * If the prop is set here, then this change is not
                 * being inherited here or below; stop the recursion.
                 */
-               err = zap_lookup(mos, dd->dd_phys->dd_props_zapobj, propname,
-                   8, 1, &dummyval);
+               err = zap_contains(mos, dd->dd_phys->dd_props_zapobj, propname);
                if (err == 0) {
-                       dsl_dir_close(dd, FTAG);
+                       dsl_dir_rele(dd, FTAG);
                        return;
                }
                ASSERT3U(err, ==, ENOENT);
@@ -312,15 +506,14 @@ dsl_prop_changed_notify(dsl_pool_t *dp, uint64_t ddobj,
                 * If the property is set on this ds, then it is not
                 * inherited here; don't call the callback.
                 */
-               if (propobj && 0 == zap_lookup(mos, propobj, propname,
-                   8, 1, &dummyval))
+               if (propobj && 0 == zap_contains(mos, propobj, propname))
                        continue;
 
                cbr->cbr_func(cbr->cbr_arg, value);
        }
        mutex_exit(&dd->dd_lock);
 
-       za = kmem_alloc(sizeof (zap_attribute_t), KM_SLEEP);
+       za = kmem_alloc(sizeof (zap_attribute_t), KM_PUSHPAGE);
        for (zap_cursor_init(&zc, mos,
            dd->dd_phys->dd_child_dir_zapobj);
            zap_cursor_retrieve(&zc, za) == 0;
@@ -330,33 +523,29 @@ dsl_prop_changed_notify(dsl_pool_t *dp, uint64_t ddobj,
        }
        kmem_free(za, sizeof (zap_attribute_t));
        zap_cursor_fini(&zc);
-       dsl_dir_close(dd, FTAG);
+       dsl_dir_rele(dd, FTAG);
 }
 
-struct prop_set_arg {
-       const char *name;
-       int intsz;
-       int numints;
-       const void *buf;
-};
-
-
-static void
-dsl_prop_set_sync(void *arg1, void *arg2, cred_t *cr, dmu_tx_t *tx)
+void
+dsl_prop_set_sync_impl(dsl_dataset_t *ds, const char *propname,
+    zprop_source_t source, int intsz, int numints, const void *value,
+    dmu_tx_t *tx)
 {
-       dsl_dataset_t *ds = arg1;
-       struct prop_set_arg *psa = arg2;
        objset_t *mos = ds->ds_dir->dd_pool->dp_meta_objset;
-       uint64_t zapobj, intval;
+       uint64_t zapobj, intval, dummy;
        int isint;
        char valbuf[32];
-       char *valstr;
+       const char *valstr = NULL;
+       char *inheritstr;
+       char *recvdstr;
+       char *tbuf = NULL;
+       int err;
+       uint64_t version = spa_version(ds->ds_dir->dd_pool->dp_spa);
 
-       isint = (dodefault(psa->name, 8, 1, &intval) == 0);
+       isint = (dodefault(propname, 8, 1, &intval) == 0);
 
-       if (dsl_dataset_is_snapshot(ds)) {
-               ASSERT(spa_version(ds->ds_dir->dd_pool->dp_spa) >=
-                   SPA_VERSION_SNAP_PROPS);
+       if (ds->ds_phys != NULL && dsl_dataset_is_snapshot(ds)) {
+               ASSERT(version >= SPA_VERSION_SNAP_PROPS);
                if (ds->ds_phys->ds_props_obj == 0) {
                        dmu_buf_will_dirty(ds->ds_dbuf, tx);
                        ds->ds_phys->ds_props_obj =
@@ -368,22 +557,91 @@ dsl_prop_set_sync(void *arg1, void *arg2, cred_t *cr, dmu_tx_t *tx)
                zapobj = ds->ds_dir->dd_phys->dd_props_zapobj;
        }
 
-       if (psa->numints == 0) {
-               int err = zap_remove(mos, zapobj, psa->name, tx);
+       if (version < SPA_VERSION_RECVD_PROPS) {
+               if (source & ZPROP_SRC_NONE)
+                       source = ZPROP_SRC_NONE;
+               else if (source & ZPROP_SRC_RECEIVED)
+                       source = ZPROP_SRC_LOCAL;
+       }
+
+       inheritstr = kmem_asprintf("%s%s", propname, ZPROP_INHERIT_SUFFIX);
+       recvdstr = kmem_asprintf("%s%s", propname, ZPROP_RECVD_SUFFIX);
+
+       switch ((int)source) {
+       case ZPROP_SRC_NONE:
+               /*
+                * revert to received value, if any (inherit -S)
+                * - remove propname
+                * - remove propname$inherit
+                */
+               err = zap_remove(mos, zapobj, propname, tx);
+               ASSERT(err == 0 || err == ENOENT);
+               err = zap_remove(mos, zapobj, inheritstr, tx);
+               ASSERT(err == 0 || err == ENOENT);
+               break;
+       case ZPROP_SRC_LOCAL:
+               /*
+                * remove propname$inherit
+                * set propname -> value
+                */
+               err = zap_remove(mos, zapobj, inheritstr, tx);
                ASSERT(err == 0 || err == ENOENT);
-               if (isint) {
-                       VERIFY(0 == dsl_prop_get_ds(ds,
-                           psa->name, 8, 1, &intval, NULL));
+               VERIFY0(zap_update(mos, zapobj, propname,
+                   intsz, numints, value, tx));
+               break;
+       case ZPROP_SRC_INHERITED:
+               /*
+                * explicitly inherit
+                * - remove propname
+                * - set propname$inherit
+                */
+               err = zap_remove(mos, zapobj, propname, tx);
+               ASSERT(err == 0 || err == ENOENT);
+               if (version >= SPA_VERSION_RECVD_PROPS &&
+                   dsl_prop_get_int_ds(ds, ZPROP_HAS_RECVD, &dummy) == 0) {
+                       dummy = 0;
+                       VERIFY0(zap_update(mos, zapobj, inheritstr,
+                           8, 1, &dummy, tx));
                }
-       } else {
-               VERIFY(0 == zap_update(mos, zapobj, psa->name,
-                   psa->intsz, psa->numints, psa->buf, tx));
-               if (isint)
-                       intval = *(uint64_t *)psa->buf;
+               break;
+       case ZPROP_SRC_RECEIVED:
+               /*
+                * set propname$recvd -> value
+                */
+               err = zap_update(mos, zapobj, recvdstr,
+                   intsz, numints, value, tx);
+               ASSERT(err == 0);
+               break;
+       case (ZPROP_SRC_NONE | ZPROP_SRC_LOCAL | ZPROP_SRC_RECEIVED):
+               /*
+                * clear local and received settings
+                * - remove propname
+                * - remove propname$inherit
+                * - remove propname$recvd
+                */
+               err = zap_remove(mos, zapobj, propname, tx);
+               ASSERT(err == 0 || err == ENOENT);
+               err = zap_remove(mos, zapobj, inheritstr, tx);
+               ASSERT(err == 0 || err == ENOENT);
+               /* FALLTHRU */
+       case (ZPROP_SRC_NONE | ZPROP_SRC_RECEIVED):
+               /*
+                * remove propname$recvd
+                */
+               err = zap_remove(mos, zapobj, recvdstr, tx);
+               ASSERT(err == 0 || err == ENOENT);
+               break;
+       default:
+               cmn_err(CE_PANIC, "unexpected property source: %d", source);
        }
 
+       strfree(inheritstr);
+       strfree(recvdstr);
+
        if (isint) {
-               if (dsl_dataset_is_snapshot(ds)) {
+               VERIFY0(dsl_prop_get_int_ds(ds, propname, &intval));
+
+               if (ds->ds_phys != NULL && dsl_dataset_is_snapshot(ds)) {
                        dsl_prop_cb_record_t *cbr;
                        /*
                         * It's a snapshot; nothing can inherit this
@@ -394,199 +652,459 @@ dsl_prop_set_sync(void *arg1, void *arg2, cred_t *cr, dmu_tx_t *tx)
                        for (cbr = list_head(&ds->ds_dir->dd_prop_cbs); cbr;
                            cbr = list_next(&ds->ds_dir->dd_prop_cbs, cbr)) {
                                if (cbr->cbr_ds == ds &&
-                                   strcmp(cbr->cbr_propname, psa->name) == 0)
+                                   strcmp(cbr->cbr_propname, propname) == 0)
                                        cbr->cbr_func(cbr->cbr_arg, intval);
                        }
                        mutex_exit(&ds->ds_dir->dd_lock);
                } else {
                        dsl_prop_changed_notify(ds->ds_dir->dd_pool,
-                           ds->ds_dir->dd_object, psa->name, intval, TRUE);
+                           ds->ds_dir->dd_object, propname, intval, TRUE);
                }
-       }
-       if (isint) {
+
                (void) snprintf(valbuf, sizeof (valbuf),
                    "%lld", (longlong_t)intval);
                valstr = valbuf;
        } else {
-               valstr = (char *)psa->buf;
+               if (source == ZPROP_SRC_LOCAL) {
+                       valstr = value;
+               } else {
+                       tbuf = kmem_alloc(ZAP_MAXVALUELEN, KM_PUSHPAGE);
+                       if (dsl_prop_get_ds(ds, propname, 1,
+                           ZAP_MAXVALUELEN, tbuf, NULL) == 0)
+                               valstr = tbuf;
+               }
        }
-       spa_history_internal_log((psa->numints == 0) ? LOG_DS_INHERIT :
-           LOG_DS_PROPSET, ds->ds_dir->dd_pool->dp_spa, tx, cr,
-           "%s=%s dataset = %llu", psa->name, 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);
 }
 
-void
-dsl_prop_set_uint64_sync(dsl_dir_t *dd, const char *name, uint64_t val,
-    cred_t *cr, dmu_tx_t *tx)
+int
+dsl_prop_set_int(const char *dsname, const char *propname,
+    zprop_source_t source, uint64_t value)
 {
-       objset_t *mos = dd->dd_pool->dp_meta_objset;
-       uint64_t zapobj = dd->dd_phys->dd_props_zapobj;
+       nvlist_t *nvl = fnvlist_alloc();
+       int error;
 
-       ASSERT(dmu_tx_is_syncing(tx));
-
-       VERIFY(0 == zap_update(mos, zapobj, name, sizeof (val), 1, &val, tx));
+       fnvlist_add_uint64(nvl, propname, value);
+       error = dsl_props_set(dsname, source, nvl);
+       fnvlist_free(nvl);
+       return (error);
+}
 
-       dsl_prop_changed_notify(dd->dd_pool, dd->dd_object, name, val, TRUE);
+int
+dsl_prop_set_string(const char *dsname, const char *propname,
+    zprop_source_t source, const char *value)
+{
+       nvlist_t *nvl = fnvlist_alloc();
+       int error;
 
-       spa_history_internal_log(LOG_DS_PROPSET, dd->dd_pool->dp_spa, tx, cr,
-           "%s=%llu dataset = %llu", name, (u_longlong_t)val,
-           dd->dd_phys->dd_head_dataset_obj);
+       fnvlist_add_string(nvl, propname, value);
+       error = dsl_props_set(dsname, source, nvl);
+       fnvlist_free(nvl);
+       return (error);
 }
 
 int
-dsl_prop_set(const char *dsname, const char *propname,
-    int intsz, int numints, const void *buf)
+dsl_prop_inherit(const char *dsname, const char *propname,
+    zprop_source_t source)
+{
+       nvlist_t *nvl = fnvlist_alloc();
+       int error;
+
+       fnvlist_add_boolean(nvl, propname);
+       error = dsl_props_set(dsname, source, nvl);
+       fnvlist_free(nvl);
+       return (error);
+}
+
+typedef struct dsl_props_set_arg {
+       const char *dpsa_dsname;
+       zprop_source_t dpsa_source;
+       nvlist_t *dpsa_props;
+} dsl_props_set_arg_t;
+
+static int
+dsl_props_set_check(void *arg, dmu_tx_t *tx)
 {
+       dsl_props_set_arg_t *dpsa = arg;
+       dsl_pool_t *dp = dmu_tx_pool(tx);
        dsl_dataset_t *ds;
+       uint64_t version;
+       nvpair_t *elem = NULL;
        int err;
-       struct prop_set_arg psa;
 
-       /*
-        * We must do these checks before we get to the syncfunc, since
-        * it can't fail.
-        */
-       if (strlen(propname) >= ZAP_MAXNAMELEN)
-               return (ENAMETOOLONG);
-       if (intsz * numints >= ZAP_MAXVALUELEN)
-               return (E2BIG);
-
-       err = dsl_dataset_hold(dsname, FTAG, &ds);
-       if (err)
+       err = dsl_dataset_hold(dp, dpsa->dpsa_dsname, FTAG, &ds);
+       if (err != 0)
                return (err);
 
-       if (dsl_dataset_is_snapshot(ds) &&
-           spa_version(ds->ds_dir->dd_pool->dp_spa) < SPA_VERSION_SNAP_PROPS) {
+       version = spa_version(ds->ds_dir->dd_pool->dp_spa);
+       while ((elem = nvlist_next_nvpair(dpsa->dpsa_props, elem)) != NULL) {
+               if (strlen(nvpair_name(elem)) >= ZAP_MAXNAMELEN) {
+                       dsl_dataset_rele(ds, FTAG);
+                       return (SET_ERROR(ENAMETOOLONG));
+               }
+               if (nvpair_type(elem) == DATA_TYPE_STRING) {
+                       char *valstr = fnvpair_value_string(elem);
+                       if (strlen(valstr) >= (version <
+                           SPA_VERSION_STMF_PROP ?
+                           ZAP_OLDMAXVALUELEN : ZAP_MAXVALUELEN)) {
+                               dsl_dataset_rele(ds, FTAG);
+                               return (E2BIG);
+                       }
+               }
+       }
+
+       if (dsl_dataset_is_snapshot(ds) && version < SPA_VERSION_SNAP_PROPS) {
                dsl_dataset_rele(ds, FTAG);
-               return (ENOTSUP);
+               return (SET_ERROR(ENOTSUP));
+       }
+       dsl_dataset_rele(ds, FTAG);
+       return (0);
+}
+
+void
+dsl_props_set_sync_impl(dsl_dataset_t *ds, zprop_source_t source,
+    nvlist_t *props, dmu_tx_t *tx)
+{
+       nvpair_t *elem = NULL;
+
+       while ((elem = nvlist_next_nvpair(props, elem)) != NULL) {
+               nvpair_t *pair = elem;
+
+               if (nvpair_type(pair) == DATA_TYPE_NVLIST) {
+                       /*
+                        * dsl_prop_get_all_impl() returns properties in this
+                        * format.
+                        */
+                       nvlist_t *attrs = fnvpair_value_nvlist(pair);
+                       pair = fnvlist_lookup_nvpair(attrs, ZPROP_VALUE);
+               }
+
+               if (nvpair_type(pair) == DATA_TYPE_STRING) {
+                       const char *value = fnvpair_value_string(pair);
+                       dsl_prop_set_sync_impl(ds, nvpair_name(pair),
+                           source, 1, strlen(value) + 1, value, tx);
+               } else if (nvpair_type(pair) == DATA_TYPE_UINT64) {
+                       uint64_t intval = fnvpair_value_uint64(pair);
+                       dsl_prop_set_sync_impl(ds, nvpair_name(pair),
+                           source, sizeof (intval), 1, &intval, tx);
+               } else if (nvpair_type(pair) == DATA_TYPE_BOOLEAN) {
+                       dsl_prop_set_sync_impl(ds, nvpair_name(pair),
+                           source, 0, 0, NULL, tx);
+               } else {
+                       panic("invalid nvpair type");
+               }
        }
+}
 
-       psa.name = propname;
-       psa.intsz = intsz;
-       psa.numints = numints;
-       psa.buf = buf;
-       err = dsl_sync_task_do(ds->ds_dir->dd_pool,
-           NULL, dsl_prop_set_sync, ds, &psa, 2);
+static void
+dsl_props_set_sync(void *arg, dmu_tx_t *tx)
+{
+       dsl_props_set_arg_t *dpsa = arg;
+       dsl_pool_t *dp = dmu_tx_pool(tx);
+       dsl_dataset_t *ds;
 
+       VERIFY0(dsl_dataset_hold(dp, dpsa->dpsa_dsname, FTAG, &ds));
+       dsl_props_set_sync_impl(ds, dpsa->dpsa_source, dpsa->dpsa_props, tx);
        dsl_dataset_rele(ds, FTAG);
-       return (err);
 }
 
 /*
- * Iterate over all properties for this dataset and return them in an nvlist.
+ * All-or-nothing; if any prop can't be set, nothing will be modified.
  */
 int
-dsl_prop_get_all(objset_t *os, nvlist_t **nvp, boolean_t local)
+dsl_props_set(const char *dsname, zprop_source_t source, nvlist_t *props)
 {
-       dsl_dataset_t *ds = os->os->os_dsl_dataset;
-       dsl_dir_t *dd = ds->ds_dir;
-       boolean_t snapshot = dsl_dataset_is_snapshot(ds);
-       int err = 0;
-       dsl_pool_t *dp = dd->dd_pool;
-       objset_t *mos = dp->dp_meta_objset;
-       uint64_t propobj = ds->ds_phys->ds_props_obj;
+       dsl_props_set_arg_t dpsa;
+       int nblks = 0;
 
-       VERIFY(nvlist_alloc(nvp, NV_UNIQUE_NAME, KM_SLEEP) == 0);
+       dpsa.dpsa_dsname = dsname;
+       dpsa.dpsa_source = source;
+       dpsa.dpsa_props = props;
 
-       if (local && snapshot && !propobj)
-               return (0);
+       /*
+        * If the source includes NONE, then we will only be removing entries
+        * from the ZAP object.  In that case don't check for ENOSPC.
+        */
+       if ((source & ZPROP_SRC_NONE) == 0)
+               nblks = 2 * fnvlist_num_pairs(props);
 
-       rw_enter(&dp->dp_config_rwlock, RW_READER);
-       while (dd != NULL) {
-               char setpoint[MAXNAMELEN];
-               zap_cursor_t zc;
-               zap_attribute_t za;
-               dsl_dir_t *dd_next;
+       return (dsl_sync_task(dsname, dsl_props_set_check, dsl_props_set_sync,
+           &dpsa, nblks));
+}
 
-               if (propobj) {
-                       dsl_dataset_name(ds, setpoint);
-                       dd_next = dd;
-               } else {
-                       dsl_dir_name(dd, setpoint);
-                       propobj = dd->dd_phys->dd_props_zapobj;
-                       dd_next = dd->dd_parent;
-               }
+typedef enum dsl_prop_getflags {
+       DSL_PROP_GET_INHERITING = 0x1,  /* searching parent of target ds */
+       DSL_PROP_GET_SNAPSHOT = 0x2,    /* snapshot dataset */
+       DSL_PROP_GET_LOCAL = 0x4,       /* local properties */
+       DSL_PROP_GET_RECEIVED = 0x8     /* received properties */
+} dsl_prop_getflags_t;
+
+static int
+dsl_prop_get_all_impl(objset_t *mos, uint64_t propobj,
+    const char *setpoint, dsl_prop_getflags_t flags, nvlist_t *nv)
+{
+       zap_cursor_t zc;
+       zap_attribute_t za;
+       int err = 0;
 
-               for (zap_cursor_init(&zc, mos, propobj);
-                   (err = zap_cursor_retrieve(&zc, &za)) == 0;
-                   zap_cursor_advance(&zc)) {
-                       nvlist_t *propval;
-                       zfs_prop_t prop = zfs_name_to_prop(za.za_name);
+       for (zap_cursor_init(&zc, mos, propobj);
+           (err = zap_cursor_retrieve(&zc, &za)) == 0;
+           zap_cursor_advance(&zc)) {
+               nvlist_t *propval;
+               zfs_prop_t prop;
+               char buf[ZAP_MAXNAMELEN];
+               char *valstr;
+               const char *suffix;
+               const char *propname;
+               const char *source;
 
-                       /* Skip non-inheritable properties. */
-                       if (prop != ZPROP_INVAL &&
-                           !zfs_prop_inheritable(prop) &&
-                           (dd != ds->ds_dir || (snapshot && dd != dd_next)))
-                               continue;
+               suffix = strchr(za.za_name, '$');
 
-                       /* Skip properties not valid for this type. */
-                       if (snapshot && prop != ZPROP_INVAL &&
-                           !zfs_prop_valid_for_type(prop, ZFS_TYPE_SNAPSHOT))
+               if (suffix == NULL) {
+                       /*
+                        * Skip local properties if we only want received
+                        * properties.
+                        */
+                       if (flags & DSL_PROP_GET_RECEIVED)
                                continue;
 
-                       /* Skip properties already defined */
-                       if (nvlist_lookup_nvlist(*nvp, za.za_name,
-                           &propval) == 0)
+                       propname = za.za_name;
+                       source = setpoint;
+               } else if (strcmp(suffix, ZPROP_INHERIT_SUFFIX) == 0) {
+                       /* Skip explicitly inherited entries. */
+                       continue;
+               } else if (strcmp(suffix, ZPROP_RECVD_SUFFIX) == 0) {
+                       if (flags & DSL_PROP_GET_LOCAL)
                                continue;
 
-                       VERIFY(nvlist_alloc(&propval, NV_UNIQUE_NAME,
-                           KM_SLEEP) == 0);
-                       if (za.za_integer_length == 1) {
-                               /*
-                                * String property
-                                */
-                               char *tmp = kmem_alloc(za.za_num_integers,
-                                   KM_SLEEP);
-                               err = zap_lookup(mos, propobj,
-                                   za.za_name, 1, za.za_num_integers, tmp);
-                               if (err != 0) {
-                                       kmem_free(tmp, za.za_num_integers);
+                       (void) strncpy(buf, za.za_name, (suffix - za.za_name));
+                       buf[suffix - za.za_name] = '\0';
+                       propname = buf;
+
+                       if (!(flags & DSL_PROP_GET_RECEIVED)) {
+                               /* Skip if locally overridden. */
+                               err = zap_contains(mos, propobj, propname);
+                               if (err == 0)
+                                       continue;
+                               if (err != ENOENT)
+                                       break;
+
+                               /* Skip if explicitly inherited. */
+                               valstr = kmem_asprintf("%s%s", propname,
+                                   ZPROP_INHERIT_SUFFIX);
+                               err = zap_contains(mos, propobj, valstr);
+                               strfree(valstr);
+                               if (err == 0)
+                                       continue;
+                               if (err != ENOENT)
                                        break;
-                               }
-                               VERIFY(nvlist_add_string(propval, ZPROP_VALUE,
-                                   tmp) == 0);
-                               kmem_free(tmp, za.za_num_integers);
-                       } else {
-                               /*
-                                * Integer property
-                                */
-                               ASSERT(za.za_integer_length == 8);
-                               (void) nvlist_add_uint64(propval, ZPROP_VALUE,
-                                   za.za_first_integer);
                        }
 
-                       VERIFY(nvlist_add_string(propval, ZPROP_SOURCE,
-                           setpoint) == 0);
-                       VERIFY(nvlist_add_nvlist(*nvp, za.za_name,
-                           propval) == 0);
-                       nvlist_free(propval);
+                       source = ((flags & DSL_PROP_GET_INHERITING) ?
+                           setpoint : ZPROP_SOURCE_VAL_RECVD);
+               } else {
+                       /*
+                        * For backward compatibility, skip suffixes we don't
+                        * recognize.
+                        */
+                       continue;
                }
-               zap_cursor_fini(&zc);
 
-               if (err != ENOENT)
-                       break;
+               prop = zfs_name_to_prop(propname);
+
+               /* Skip non-inheritable properties. */
+               if ((flags & DSL_PROP_GET_INHERITING) && prop != ZPROP_INVAL &&
+                   !zfs_prop_inheritable(prop))
+                       continue;
+
+               /* Skip properties not valid for this type. */
+               if ((flags & DSL_PROP_GET_SNAPSHOT) && prop != ZPROP_INVAL &&
+                   !zfs_prop_valid_for_type(prop, ZFS_TYPE_SNAPSHOT))
+                       continue;
+
+               /* Skip properties already defined. */
+               if (nvlist_exists(nv, propname))
+                       continue;
+
+               VERIFY(nvlist_alloc(&propval, NV_UNIQUE_NAME, KM_SLEEP) == 0);
+               if (za.za_integer_length == 1) {
+                       /*
+                        * String property
+                        */
+                       char *tmp = kmem_alloc(za.za_num_integers,
+                           KM_SLEEP);
+                       err = zap_lookup(mos, propobj,
+                           za.za_name, 1, za.za_num_integers, tmp);
+                       if (err != 0) {
+                               kmem_free(tmp, za.za_num_integers);
+                               break;
+                       }
+                       VERIFY(nvlist_add_string(propval, ZPROP_VALUE,
+                           tmp) == 0);
+                       kmem_free(tmp, za.za_num_integers);
+               } else {
+                       /*
+                        * Integer property
+                        */
+                       ASSERT(za.za_integer_length == 8);
+                       (void) nvlist_add_uint64(propval, ZPROP_VALUE,
+                           za.za_first_integer);
+               }
+
+               VERIFY(nvlist_add_string(propval, ZPROP_SOURCE, source) == 0);
+               VERIFY(nvlist_add_nvlist(nv, propname, propval) == 0);
+               nvlist_free(propval);
+       }
+       zap_cursor_fini(&zc);
+       if (err == ENOENT)
                err = 0;
-               /*
-                * If we are just after the props that have been set
-                * locally, then we are done after the first iteration.
-                */
-               if (local)
-                       break;
-               dd = dd_next;
-               propobj = 0;
+       return (err);
+}
+
+/*
+ * Iterate over all properties for this dataset and return them in an nvlist.
+ */
+static int
+dsl_prop_get_all_ds(dsl_dataset_t *ds, nvlist_t **nvp,
+    dsl_prop_getflags_t flags)
+{
+       dsl_dir_t *dd = ds->ds_dir;
+       dsl_pool_t *dp = dd->dd_pool;
+       objset_t *mos = dp->dp_meta_objset;
+       int err = 0;
+       char setpoint[MAXNAMELEN];
+
+       VERIFY(nvlist_alloc(nvp, NV_UNIQUE_NAME, KM_SLEEP) == 0);
+
+       if (dsl_dataset_is_snapshot(ds))
+               flags |= DSL_PROP_GET_SNAPSHOT;
+
+       ASSERT(dsl_pool_config_held(dp));
+
+       if (ds->ds_phys->ds_props_obj != 0) {
+               ASSERT(flags & DSL_PROP_GET_SNAPSHOT);
+               dsl_dataset_name(ds, setpoint);
+               err = dsl_prop_get_all_impl(mos, ds->ds_phys->ds_props_obj,
+                   setpoint, flags, *nvp);
+               if (err)
+                       goto out;
        }
-       rw_exit(&dp->dp_config_rwlock);
 
+       for (; dd != NULL; dd = dd->dd_parent) {
+               if (dd != ds->ds_dir || (flags & DSL_PROP_GET_SNAPSHOT)) {
+                       if (flags & (DSL_PROP_GET_LOCAL |
+                           DSL_PROP_GET_RECEIVED))
+                               break;
+                       flags |= DSL_PROP_GET_INHERITING;
+               }
+               dsl_dir_name(dd, setpoint);
+               err = dsl_prop_get_all_impl(mos, dd->dd_phys->dd_props_zapobj,
+                   setpoint, flags, *nvp);
+               if (err)
+                       break;
+       }
+out:
        return (err);
 }
 
+boolean_t
+dsl_prop_get_hasrecvd(const char *dsname)
+{
+       uint64_t dummy;
+
+       return (0 ==
+           dsl_prop_get_integer(dsname, ZPROP_HAS_RECVD, &dummy, NULL));
+}
+
+static int
+dsl_prop_set_hasrecvd_impl(const char *dsname, zprop_source_t source)
+{
+       uint64_t version;
+       spa_t *spa;
+       int error = 0;
+
+       VERIFY0(spa_open(dsname, &spa, FTAG));
+       version = spa_version(spa);
+       spa_close(spa, FTAG);
+
+       if (version >= SPA_VERSION_RECVD_PROPS)
+               error = dsl_prop_set_int(dsname, ZPROP_HAS_RECVD, source, 0);
+       return (error);
+}
+
+/*
+ * Call after successfully receiving properties to ensure that only the first
+ * receive on or after SPA_VERSION_RECVD_PROPS blows away local properties.
+ */
+int
+dsl_prop_set_hasrecvd(const char *dsname)
+{
+       int error = 0;
+       if (!dsl_prop_get_hasrecvd(dsname))
+               error = dsl_prop_set_hasrecvd_impl(dsname, ZPROP_SRC_LOCAL);
+       return (error);
+}
+
+void
+dsl_prop_unset_hasrecvd(const char *dsname)
+{
+       VERIFY0(dsl_prop_set_hasrecvd_impl(dsname, ZPROP_SRC_NONE));
+}
+
+int
+dsl_prop_get_all(objset_t *os, nvlist_t **nvp)
+{
+       return (dsl_prop_get_all_ds(os->os_dsl_dataset, nvp, 0));
+}
+
+int
+dsl_prop_get_received(const char *dsname, nvlist_t **nvp)
+{
+       objset_t *os;
+       int error;
+
+       /*
+        * Received properties are not distinguishable from local properties
+        * until the dataset has received properties on or after
+        * SPA_VERSION_RECVD_PROPS.
+        */
+       dsl_prop_getflags_t flags = (dsl_prop_get_hasrecvd(dsname) ?
+           DSL_PROP_GET_RECEIVED : DSL_PROP_GET_LOCAL);
+
+       error = dmu_objset_hold(dsname, FTAG, &os);
+       if (error != 0)
+               return (error);
+       error = dsl_prop_get_all_ds(os->os_dsl_dataset, nvp, flags);
+       dmu_objset_rele(os, FTAG);
+       return (error);
+}
+
 void
 dsl_prop_nvlist_add_uint64(nvlist_t *nv, zfs_prop_t prop, uint64_t value)
 {
        nvlist_t *propval;
+       const char *propname = zfs_prop_to_name(prop);
+       uint64_t default_value;
+
+       if (nvlist_lookup_nvlist(nv, propname, &propval) == 0) {
+               VERIFY(nvlist_add_uint64(propval, ZPROP_VALUE, value) == 0);
+               return;
+       }
 
        VERIFY(nvlist_alloc(&propval, NV_UNIQUE_NAME, KM_SLEEP) == 0);
        VERIFY(nvlist_add_uint64(propval, ZPROP_VALUE, value) == 0);
-       VERIFY(nvlist_add_nvlist(nv, zfs_prop_to_name(prop), propval) == 0);
+       /* Indicate the default source if we can. */
+       if (dodefault(propname, 8, 1, &default_value) == 0 &&
+           value == default_value) {
+               VERIFY(nvlist_add_string(propval, ZPROP_SOURCE, "") == 0);
+       }
+       VERIFY(nvlist_add_nvlist(nv, propname, propval) == 0);
        nvlist_free(propval);
 }
 
@@ -594,9 +1112,34 @@ void
 dsl_prop_nvlist_add_string(nvlist_t *nv, zfs_prop_t prop, const char *value)
 {
        nvlist_t *propval;
+       const char *propname = zfs_prop_to_name(prop);
+
+       if (nvlist_lookup_nvlist(nv, propname, &propval) == 0) {
+               VERIFY(nvlist_add_string(propval, ZPROP_VALUE, value) == 0);
+               return;
+       }
 
        VERIFY(nvlist_alloc(&propval, NV_UNIQUE_NAME, KM_SLEEP) == 0);
        VERIFY(nvlist_add_string(propval, ZPROP_VALUE, value) == 0);
-       VERIFY(nvlist_add_nvlist(nv, zfs_prop_to_name(prop), propval) == 0);
+       VERIFY(nvlist_add_nvlist(nv, propname, propval) == 0);
        nvlist_free(propval);
 }
+
+#if defined(_KERNEL) && defined(HAVE_SPL)
+EXPORT_SYMBOL(dsl_prop_register);
+EXPORT_SYMBOL(dsl_prop_unregister);
+EXPORT_SYMBOL(dsl_prop_get);
+EXPORT_SYMBOL(dsl_prop_get_integer);
+EXPORT_SYMBOL(dsl_prop_get_all);
+EXPORT_SYMBOL(dsl_prop_get_received);
+EXPORT_SYMBOL(dsl_prop_get_ds);
+EXPORT_SYMBOL(dsl_prop_get_int_ds);
+EXPORT_SYMBOL(dsl_prop_get_dd);
+EXPORT_SYMBOL(dsl_props_set);
+EXPORT_SYMBOL(dsl_prop_set_int);
+EXPORT_SYMBOL(dsl_prop_set_string);
+EXPORT_SYMBOL(dsl_prop_inherit);
+EXPORT_SYMBOL(dsl_prop_predict);
+EXPORT_SYMBOL(dsl_prop_nvlist_add_uint64);
+EXPORT_SYMBOL(dsl_prop_nvlist_add_string);
+#endif