From 7e8dbd93e214566c4955933990f78f78b6c88d74 Mon Sep 17 00:00:00 2001 From: George Melikov Date: Tue, 24 Jan 2017 20:15:35 +0300 Subject: [PATCH] OpenZFS 7571 - non-present readonly numeric ZFS props do not have default value Authored by: Matthew Ahrens Reviewed by: Dan Kimmel Reviewed by: George Wilson Approved by: Robert Mustacchi Reviewed-by: Brian Behlendorf Ported-by: George Melikov OpenZFS-issue: https://www.illumos.org/issues/7571 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/ad2760a Closes #5638 --- lib/libzfs/libzfs_dataset.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c index ded3d61df..469bdee20 100644 --- a/lib/libzfs/libzfs_dataset.c +++ b/lib/libzfs/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) 2012 Pawel Jakub Dawidek . * Copyright (c) 2013 Martin Matuska. All rights reserved. @@ -2109,6 +2109,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;