diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-26 18:32:36 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-06-26 18:32:36 +0000 |
| commit | 8aef19f7563fa7e20f072f46202468eb3bda3868 (patch) | |
| tree | cd9a1b1f0d83a83bdf98e50ab1418774cce610ed /usr/src/common/zfs/zfs_prop.c | |
| parent | f4df7cccbc6a219c58b697781910766c28800dd9 (diff) | |
| parent | f67cf39ba88ad7c4bee81445cc7a7468e0289f01 (diff) | |
| download | illumos-joyent-8aef19f7563fa7e20f072f46202468eb3bda3868.tar.gz | |
[illumos-gate merge]
commit f67cf39ba88ad7c4bee81445cc7a7468e0289f01
commit 7edb9f69d2426b044fa60c7a168c9eaeb12f1884
6431 document FreeBSD regex extensions
commit dfc115332c94a2f62058ac7f2bce7631fbd20b3d
7431 ZFS Channel Programs
Conflicts:
usr/src/lib/libzpool/common/sys/zfs_context.h
usr/src/lib/libzfs/common/libzfs_util.c
usr/src/lib/libzfs/common/libzfs_impl.h
Diffstat (limited to 'usr/src/common/zfs/zfs_prop.c')
| -rw-r--r-- | usr/src/common/zfs/zfs_prop.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/usr/src/common/zfs/zfs_prop.c b/usr/src/common/zfs/zfs_prop.c index bfd1d48cab..b9d490c45d 100644 --- a/usr/src/common/zfs/zfs_prop.c +++ b/usr/src/common/zfs/zfs_prop.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011, 2014 by Delphix. All rights reserved. + * Copyright (c) 2011, 2016 by Delphix. All rights reserved. * Copyright (c) 2013 by Saso Kiselkov. All rights reserved. * Copyright (c) 2014 Integros [integros.com] * Copyright 2016, Joyent, Inc. @@ -381,7 +381,8 @@ zfs_prop_init(void) zprop_register_number(ZFS_PROP_WRITTEN, "written", 0, PROP_READONLY, ZFS_TYPE_DATASET, "<size>", "WRITTEN"); zprop_register_number(ZFS_PROP_LOGICALUSED, "logicalused", 0, - PROP_READONLY, ZFS_TYPE_DATASET, "<size>", "LUSED"); + PROP_READONLY, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME, "<size>", + "LUSED"); zprop_register_number(ZFS_PROP_LOGICALREFERENCED, "logicalreferenced", 0, PROP_READONLY, ZFS_TYPE_DATASET, "<size>", "LREFER"); zprop_register_number(ZFS_PROP_FILESYSTEM_COUNT, "filesystem_count", @@ -602,6 +603,15 @@ zfs_prop_readonly(zfs_prop_t prop) } /* + * Returns TRUE if the property is visible (not hidden). + */ +boolean_t +zfs_prop_visible(zfs_prop_t prop) +{ + return (zfs_prop_table[prop].pd_visible); +} + +/* * Returns TRUE if the property is only allowed to be set once. */ boolean_t |