svn commit: r325139 - stable/11/cddl/contrib/opensolaris/lib/libzfs/common
Andriy Gapon
avg at FreeBSD.org
Mon Oct 30 09:01:04 UTC 2017
Author: avg
Date: Mon Oct 30 09:01:02 2017
New Revision: 325139
URL: https://svnweb.freebsd.org/changeset/base/325139
Log:
MFC r324345: MFV r316877: 7571 non-present readonly numeric ZFS props do not have default value
Modified:
stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Mon Oct 30 08:58:39 2017 (r325138)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Mon Oct 30 09:01:02 2017 (r325139)
@@ -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.
@@ -2166,6 +2166,7 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t pro
if (zfs_prop_readonly(prop) &&
*source != NULL && (*source)[0] == '\0') {
*source = NULL;
+ return (-1);
}
break;
More information about the svn-src-stable-11
mailing list