diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-29 13:07:47 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-11-29 13:07:47 +0000 |
| commit | 444edd511d421297a90190746238086cec50a3f1 (patch) | |
| tree | 99c57aa69e46ad068c9205ed33edcb63fdb7681d /usr/src | |
| parent | 90fa1a0e184c887ef2a0987fa046c3aeb6f12c6b (diff) | |
| parent | 4d86c0eab246bdfddc2dd52410ba808433bd6266 (diff) | |
| download | illumos-joyent-444edd511d421297a90190746238086cec50a3f1.tar.gz | |
[illumos-gate merge]
commit 4d86c0eab246bdfddc2dd52410ba808433bd6266
7604 if volblocksize property is the default, it displays as "-" rather than 8K
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_dataset.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index c316bd72dd..2098930ed7 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -2134,9 +2134,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; } |