summaryrefslogtreecommitdiff
path: root/usr/src/cmd/ztest/ztest.c
diff options
context:
space:
mode:
authorTom Erickson <Tom.Erickson@Sun.COM>2009-11-09 20:45:32 -0800
committerTom Erickson <Tom.Erickson@Sun.COM>2009-11-09 20:45:32 -0800
commit92241e0b80813d0b83c08e730a29b9d1831794fc (patch)
treeae911ea5f6928508430420730ad8dba20b5b3aa2 /usr/src/cmd/ztest/ztest.c
parent8d4cf8d8d2965ea43bccdc838f15c18634fee02d (diff)
downloadillumos-gate-92241e0b80813d0b83c08e730a29b9d1831794fc.tar.gz
PSARC 2009/510 ZFS received properties
6850025 want to preserve local properties for zfs_recv 6839260 want zfs send with properties 6855486 zfs_receive should keep trying to set properties even after some fail 6850030 snapshots on read-only dataset shouldn't affect zfs_receive
Diffstat (limited to 'usr/src/cmd/ztest/ztest.c')
-rw-r--r--usr/src/cmd/ztest/ztest.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr/src/cmd/ztest/ztest.c b/usr/src/cmd/ztest/ztest.c
index 37d695905b..215aad2bea 100644
--- a/usr/src/cmd/ztest/ztest.c
+++ b/usr/src/cmd/ztest/ztest.c
@@ -815,8 +815,9 @@ ztest_dsl_prop_set_uint64(char *osname, zfs_prop_t prop, uint64_t value,
uint64_t curval;
int error;
- error = dsl_prop_set(osname, propname, sizeof (value),
- inherit ? 0 : 1, &value);
+ error = dsl_prop_set(osname, propname,
+ (inherit ? ZPROP_SRC_NONE : ZPROP_SRC_LOCAL),
+ sizeof (value), 1, &value);
if (error == ENOSPC) {
ztest_record_enospc(FTAG);