diff options
| author | Matthew Ahrens <mahrens@delphix.com> | 2016-11-28 19:45:23 -0800 |
|---|---|---|
| committer | Matthew Ahrens <mahrens@delphix.com> | 2016-11-28 19:49:23 -0800 |
| commit | 4d86c0eab246bdfddc2dd52410ba808433bd6266 (patch) | |
| tree | cf312b17822982e4ac8c45d9ae46762599cb0566 /usr/src | |
| parent | 396aa62085ffd432d59ad504f1ac0827512580f4 (diff) | |
| download | illumos-joyent-4d86c0eab246bdfddc2dd52410ba808433bd6266.tar.gz | |
7604 if volblocksize property is the default, it displays as "-" rather than 8K
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Reviewed by: Paul Dagnelie <pcd@delphix.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
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 32a8dbf682..a01d29e8c1 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -2125,9 +2125,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); |