summaryrefslogtreecommitdiff
path: root/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2018-02-20 20:34:04 +0000
committerAlexander Motin <mav@FreeBSD.org>2018-02-20 20:34:04 +0000
commit9f6122a6e71e067fa6e509035322a4540fcffd4f (patch)
tree0a425436e974b5681a4f001e3c99a35c75dd49a3 /cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
parent806141acfccddba37d587867ade97f0993d215fd (diff)
parent9c03f5f793be3e3491cbae091957676f69db33b1 (diff)
Notes
Diffstat (limited to 'cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c')
-rw-r--r--cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
index f3328e942527..9ffa18dcd8c9 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
@@ -2161,9 +2161,12 @@ get_numeric_property(zfs_handle_t *zhp, zfs_prop_t prop, zprop_source_t *src,
/*
* If we tried to use a default value for a
* readonly property, it means that it was not
- * present.
+ * present. Note this only applies to "truly"
+ * readonly properties, not set-once properties
+ * like volblocksize.
*/
if (zfs_prop_readonly(prop) &&
+ !zfs_prop_setonce(prop) &&
*source != NULL && (*source)[0] == '\0') {
*source = NULL;
return (-1);