diff -r c5323cd5fa92 -r 63ab26072e41 usr/src/uts/common/fs/zfs/dmu_objset.c
--- a/usr/src/uts/common/fs/zfs/dmu_objset.c	Mon Nov 09 20:01:32 2009 -0800
+++ b/usr/src/uts/common/fs/zfs/dmu_objset.c	Mon Nov 09 20:45:32 2009 -0800
@@ -769,8 +769,12 @@
 
 	dsl_dataset_snapshot_sync(ds, sn->snapname, cr, tx);
 
-	if (sn->props)
-		dsl_props_set_sync(ds->ds_prev, sn->props, cr, tx);
+	if (sn->props) {
+		dsl_props_arg_t pa;
+		pa.pa_props = sn->props;
+		pa.pa_source = ZPROP_SRC_LOCAL;
+		dsl_props_set_sync(ds->ds_prev, &pa, cr, tx);
+	}
 }
 
 static int