diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-29 00:21:21 +0000 |
|---|---|---|
| committer | Patrick Mooney <pmooney@pfmooney.com> | 2016-11-29 00:30:06 +0000 |
| commit | 152dd84b33c1bb160c07bb097ec4a9ba5e6556c8 (patch) | |
| tree | 180960b5add5572ce7bb1338b107b711e60dbf4b | |
| parent | e37c335e4639fbb0e0f2fc5f4efd7712783da31d (diff) | |
| download | illumos-joyent-release-20161124.tar.gz | |
Revert "7571 non-present readonly numeric ZFS props do not have default value"release-20161124
This reverts commit ad2760acbd9c3b479bf632f05c6f03d89830799d.
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_dataset.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index bbb0acaa3d..c316bd72dd 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, 2016 by Delphix. All rights reserved. + * Copyright (c) 2011, 2015 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. @@ -2139,7 +2139,6 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t prop, zprop_source_t *src, if (zfs_prop_readonly(prop) && *source != NULL && (*source)[0] == '\0') { *source = NULL; - return (-1); } break; |