summaryrefslogtreecommitdiff
path: root/usr/src/common/zfs/zfs_prop.c
diff options
context:
space:
mode:
authorKeith M Wesolowski <wesolows@foobazco.org>2014-04-23 19:03:53 +0000
committerKeith M Wesolowski <wesolows@foobazco.org>2014-04-23 19:03:53 +0000
commit6b3ed6f1b8fbda8338d005cbfe8ac62308064a86 (patch)
tree42ec1113910508d53ffb2fc3c3d637971fc0a01b /usr/src/common/zfs/zfs_prop.c
parent703e18fe4fdcab51c63e5f7cf2fff43735a6445d (diff)
parent4cde9a1e4370decb0ae4451cc85ce57730965c8c (diff)
downloadillumos-joyent-6b3ed6f1b8fbda8338d005cbfe8ac62308064a86.tar.gz
[illumos-gate merge]
commit 4cde9a1e4370decb0ae4451cc85ce57730965c8c 4748 use an enum for tod_faulted global commit 9aff5184bfbc5b708bf2ddd810ce726347b52332 4747 remove unused [DS]SIZE_LIMIT defines commit 3b082ee621e893f087e4272c7e8b6d512d24e155 4746 remove EXPORT_SRC leftovers commit 6907ca4bc759c5fd81b8a60fc5e1a1c7d1972e6a 4745 fix AVL code misspellings commit a2afb611b30628fb74ad9eade4ae465f9031e262 3897 zfs filesystem and snapshot limits commit 82d86f4e8b1400610e24f161032c16e049f173a0 4767 dtrace_probe() always has the timestamp Conflicts: usr/src/uts/common/fs/zfs/sys/dsl_dir.h usr/src/uts/common/fs/zfs/dsl_dir.c usr/src/lib/libzfs/common/libzfs_util.c usr/src/lib/libzfs/common/libzfs_dataset.c usr/src/common/zfs/zfeature_common.c
Diffstat (limited to 'usr/src/common/zfs/zfs_prop.c')
-rw-r--r--usr/src/common/zfs/zfs_prop.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/usr/src/common/zfs/zfs_prop.c b/usr/src/common/zfs/zfs_prop.c
index 75627c33bf..0981fcb882 100644
--- a/usr/src/common/zfs/zfs_prop.c
+++ b/usr/src/common/zfs/zfs_prop.c
@@ -371,6 +371,18 @@ zfs_prop_init(void)
zprop_register_number(ZFS_PROP_REFRESERVATION, "refreservation", 0,
PROP_DEFAULT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
"<size> | none", "REFRESERV");
+ zprop_register_number(ZFS_PROP_FILESYSTEM_LIMIT, "filesystem_limit",
+ UINT64_MAX, PROP_DEFAULT, ZFS_TYPE_FILESYSTEM,
+ "<count> | none", "FSLIMIT");
+ zprop_register_number(ZFS_PROP_SNAPSHOT_LIMIT, "snapshot_limit",
+ UINT64_MAX, PROP_DEFAULT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
+ "<count> | none", "SSLIMIT");
+ zprop_register_number(ZFS_PROP_FILESYSTEM_COUNT, "filesystem_count",
+ UINT64_MAX, PROP_DEFAULT, ZFS_TYPE_FILESYSTEM,
+ "<count>", "FSCOUNT");
+ zprop_register_number(ZFS_PROP_SNAPSHOT_COUNT, "snapshot_count",
+ UINT64_MAX, PROP_DEFAULT, ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME,
+ "<count>", "SSCOUNT");
/* inherit number properties */
zprop_register_number(ZFS_PROP_RECORDSIZE, "recordsize",