[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

1 files changed, 61 insertions, 3 deletions

diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m
index b179b5362c..59cd1e191b 100644
--- a/usr/src/man/man1m/zfs.1m
+++ b/usr/src/man/man1m/zfs.1m
@@ -25,7 +25,7 @@
 .\" Copyright (c) 2013 by Delphix. All rights reserved.
 .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
 .\" Copyright 2013 Nexenta Systems, Inc.  All Rights Reserved.
-.\" Copyright (c) 2013, Joyent, Inc. All rights reserved.
+.\" Copyright (c) 2014, Joyent, Inc. All rights reserved.
 .\" Copyright (c) 2014 by Adam Stevko. All rights reserved.
 .\"
 .TH ZFS 1M "March 6, 2014"
@@ -416,8 +416,9 @@ mounted.
 A dataset can also be delegated to a non-global zone by using the \fBzonecfg\fR
 \fBadd dataset\fR subcommand. You cannot delegate a dataset to one zone and the
 children of the same dataset to another zone. The zone administrator can change
-properties of the dataset or any of its children. However, the \fBquota\fR
-property is controlled by the global administrator.
+properties of the dataset or any of its children. However, the \fBquota\fR,
+\fBfilesystem_limit\fR and \fBsnapshot_limit\fR properties of the delegated
+dataset can be modified only by the global administrator.
 .sp
 .LP
 A \fBZFS\fR volume can be added as a device to a non-global zone by using the
@@ -544,6 +545,18 @@ by using the \fBzfs destroy\fR \fB-d\fR command. Otherwise, the property is
 .sp
 .ne 2
 .na
+\fB\fBfilesystem_count\fR
+.ad
+.sp .6
+.RS 4n
+The total number of filesystems and volumes that exist under this location in the
+dataset tree.  This value is only available when a \fBfilesystem_limit\fR has
+been set somewhere in the tree under which the dataset resides.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBlogicalreferenced\fR\fR
 .ad
 .sp .6
@@ -628,6 +641,18 @@ property.
 .sp
 .ne 2
 .na
+\fB\fBsnapshot_count\fR
+.ad
+.sp .6
+.RS 4n
+The total number of snapshots that exist under this location in the dataset tree.
+This value is only available when a \fBsnapshot_limit\fR has been set somewhere
+in the tree under which the dataset resides.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBtype\fR\fR
 .ad
 .sp .6
@@ -1032,6 +1057,21 @@ default value is \fBon\fR.
 .sp
 .ne 2
 .na
+\fB\fBfilesystem_limit\fR=\fIcount\fR | \fBnone\fR\fR
+.ad
+.sp .6
+.RS 4n
+Limits the number of filesystems and volumes that can exist under this point in
+the dataset tree.  The limit is not enforced if the user is allowed to change
+the limit. Setting a filesystem_limit on a descendent of a filesystem that
+already has a filesystem_limit does not override the ancestor's filesystem_limit,
+but rather imposes an additional limit. This feature must be enabled to be used
+(see \fBzpool-features\fR(5)).
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBmountpoint\fR=\fIpath\fR | \fBnone\fR | \fBlegacy\fR\fR
 .ad
 .sp .6
@@ -1095,6 +1135,22 @@ implicit quota.
 .sp
 .ne 2
 .na
+\fB\fBsnapshot_limit\fR=\fIcount\fR | \fBnone\fR\fR
+.ad
+.sp .6
+.RS 4n
+Limits the number of snapshots that can be created on a dataset and its
+descendents. Setting a snapshot_limit on a descendent of a dataset that already
+has a snapshot_limit does not override the ancestor's snapshot_limit, but
+rather imposes an additional limit. The limit is not enforced if the user is
+allowed to change the limit. For example, this means that recursive snapshots
+taken from the global zone are counted against each delegated dataset within
+a zone. This feature must be enabled to be used (see \fBzpool-features\fR(5)).
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBuserquota@\fR\fIuser\fR=\fIsize\fR | \fBnone\fR\fR
 .ad
 .sp .6
@@ -3270,6 +3326,7 @@ compression      property
 copies           property
 devices          property
 exec             property
+filesystem_limit property
 mountpoint       property
 nbmand           property
 normalization    property
@@ -3286,6 +3343,7 @@ shareiscsi       property
 sharenfs         property
 sharesmb         property
 snapdir          property
+snapshot_limit   property
 utf8only         property
 version          property
 volblocksize     property