svn commit: r277429 - in vendor/illumos/dist: cmd/zfs man/man1m

[Xin LI]

Author: delphij
Date: Tue Jan 20 20:13:46 2015
New Revision: 277429
URL: https://svnweb.freebsd.org/changeset/base/277429

Log:
  5410 Document -S option to zfs inherit
  5412 Mention -S option when zfs inherit fails on quota
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Approved by: Richard Lowe <richlowe at richlowe.net>
  Author: Paul B. Henson <henson at acm.org>
  
  illumos/illumos-gate at 5ff8cfa92ec8ea0f8593ad21aa2a04829b0ef5ea

Modified:
  vendor/illumos/dist/cmd/zfs/zfs_main.c
  vendor/illumos/dist/man/man1m/zfs.1m

Modified: vendor/illumos/dist/cmd/zfs/zfs_main.c
==============================================================================
--- vendor/illumos/dist/cmd/zfs/zfs_main.c	Tue Jan 20 20:11:30 2015	(r277428)
+++ vendor/illumos/dist/cmd/zfs/zfs_main.c	Tue Jan 20 20:13:46 2015	(r277429)
@@ -1890,9 +1890,13 @@ zfs_do_inherit(int argc, char **argv)
 			if (prop == ZFS_PROP_QUOTA ||
 			    prop == ZFS_PROP_RESERVATION ||
 			    prop == ZFS_PROP_REFQUOTA ||
-			    prop == ZFS_PROP_REFRESERVATION)
+			    prop == ZFS_PROP_REFRESERVATION) {
 				(void) fprintf(stderr, gettext("use 'zfs set "
 				    "%s=none' to clear\n"), propname);
+				(void) fprintf(stderr, gettext("use 'zfs "
+				    "inherit -S %s' to revert to received "
+				    "value\n"), propname);
+			}
 			return (1);
 		}
 		if (received && (prop == ZFS_PROP_VOLSIZE ||

Modified: vendor/illumos/dist/man/man1m/zfs.1m
==============================================================================
--- vendor/illumos/dist/man/man1m/zfs.1m	Tue Jan 20 20:11:30 2015	(r277428)
+++ vendor/illumos/dist/man/man1m/zfs.1m	Tue Jan 20 20:13:46 2015	(r277429)
@@ -119,7 +119,7 @@ zfs \- configures ZFS file systems
 
 .LP
 .nf
-\fBzfs\fR \fBinherit\fR [\fB-r\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume|snapshot\fR...
+\fBzfs\fR \fBinherit\fR [\fB-rS\fR] \fIproperty\fR \fIfilesystem\fR|\fIvolume|snapshot\fR...
 .fi
 
 .LP
@@ -2419,7 +2419,7 @@ property, the following columns are disp
      property  Property name
      value     Property value
      source    Property source. Can either be local, default,
-               temporary, inherited, or none (-).
+               temporary, inherited, received, or none (-).
 .fi
 .in -2
 .sp
@@ -2484,8 +2484,8 @@ is the default value.
 .RS 4n
 A comma-separated list of sources to display. Those properties coming from a
 source other than those in this list are ignored. Each source must be one of
-the following: \fBlocal,default,inherited,temporary,none\fR. The default value
-is all sources.
+the following: \fBlocal,default,inherited,received,temporary,none\fR. The
+default value is all sources.
 .RE
 
 .sp
@@ -2503,15 +2503,16 @@ Display numbers in parsable (exact) valu
 .sp
 .ne 2
 .na
-\fB\fBzfs inherit\fR [\fB-r\fR] \fIproperty\fR
+\fB\fBzfs inherit\fR [\fB-rS\fR] \fIproperty\fR
 \fIfilesystem\fR|\fIvolume\fR|\fIsnapshot\fR...\fR
 .ad
 .sp .6
 .RS 4n
-Clears the specified property, causing it to be inherited from an ancestor. If
-no ancestor has the property set, then the default value is used. See the
-"Properties" section for a listing of default values, and details on which
-properties can be inherited.
+Clears the specified property, causing it to be inherited from an ancestor,
+restored to default if no ancestor has the property set, or with the \fB-S\fR
+option reverted to the received value if one exists.  See the "Properties"
+section for a listing of default values, and details on which properties can be
+inherited.
 .sp
 .ne 2
 .na
@@ -2521,6 +2522,16 @@ properties can be inherited.
 .RS 4n
 Recursively inherit the given property for all children.
 .RE
+.sp
+.ne 2
+.na
+\fB\fB-S\fR\fR
+.ad
+.sp .6
+.RS 4n
+Revert the property to the received value if one exists; otherwise operate as
+if the \fB-S\fR option was not specified.
+.RE
 
 .RE
 
@@ -3896,6 +3907,17 @@ inherit the \fBchecksum\fR property from
 .fi
 .in -2
 .sp
+.LP
+The following command causes \fBpool/home/bob\fR to revert to the received
+value for the \fBquota\fR property if it exists.
+
+.sp
+.in +2
+.nf
+# \fBzfs inherit -S quota pool/home/bob
+.fi
+.in -2
+.sp
 
 .LP
 \fBExample 12 \fRRemotely Replicating ZFS Data