diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-04-23 19:03:53 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-04-23 19:03:53 +0000 |
| commit | 6b3ed6f1b8fbda8338d005cbfe8ac62308064a86 (patch) | |
| tree | 42ec1113910508d53ffb2fc3c3d637971fc0a01b /usr/src/man/man5/zpool-features.5 | |
| parent | 703e18fe4fdcab51c63e5f7cf2fff43735a6445d (diff) | |
| parent | 4cde9a1e4370decb0ae4451cc85ce57730965c8c (diff) | |
| download | illumos-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/man/man5/zpool-features.5')
| -rw-r--r-- | usr/src/man/man5/zpool-features.5 | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/usr/src/man/man5/zpool-features.5 b/usr/src/man/man5/zpool-features.5 index 58ec7ab7dc..076e08a2d2 100644 --- a/usr/src/man/man5/zpool-features.5 +++ b/usr/src/man/man5/zpool-features.5 @@ -1,7 +1,7 @@ '\" te .\" Copyright (c) 2013 by Delphix. All rights reserved. .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved. -.\" Copyright (c) 2013, Joyent, Inc. All rights reserved. +.\" Copyright (c) 2014, Joyent, Inc. All rights reserved. .\" The contents of this file are subject to the terms of the Common Development .\" and Distribution License (the "License"). You may not use this file except .\" in compliance with the License. You can obtain a copy of the license at @@ -202,6 +202,27 @@ or snapshots which were created after enabling this feature. .sp .ne 2 .na +\fB\fBfilesystem_limits\fR\fR +.ad +.RS 4n +.TS +l l . +GUID com.joyent:filesystem_limits +READ\-ONLY COMPATIBLE yes +DEPENDENCIES extensible_dataset +.TE + +This feature enables filesystem and snapshot limits. These limits can be used +to control how many filesystems and/or snapshots can be created at the point in +the tree on which the limits are set. + +This feature is \fBactive\fR once either of the limit properties has been +set on a dataset. Once activated the feature is never deactivated. +.RE + +.sp +.ne 2 +.na \fB\fBlz4_compress\fR\fR .ad .RS 4n |