From 12fff98ee5917359b18247a1cf2e8292ab958f8b Mon Sep 17 00:00:00 2001 From: Jerry Jelinek Date: Tue, 29 Nov 2016 13:16:18 +0000 Subject: Revert "Revert "7571 non-present readonly numeric ZFS props do not have default value"" This reverts commit 90fa1a0e184c887ef2a0987fa046c3aeb6f12c6b. --- usr/src/lib/libzfs/common/libzfs_dataset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'usr/src/lib/libzfs/common/libzfs_dataset.c') diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index 2098930ed7..8f56c4042b 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -22,7 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, Joyent, Inc. All rights reserved. - * Copyright (c) 2011, 2015 by Delphix. All rights reserved. + * Copyright (c) 2011, 2016 by Delphix. All rights reserved. * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved. * Copyright (c) 2011-2012 Pawel Jakub Dawidek. All rights reserved. * Copyright (c) 2013 Martin Matuska. All rights reserved. @@ -2142,6 +2142,7 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t prop, zprop_source_t *src, !zfs_prop_setonce(prop) && *source != NULL && (*source)[0] == '\0') { *source = NULL; + return (-1); } break; -- cgit v1.2.3