Author: delphij
Date: Mon Sep 28 18:58:27 2015
New Revision: 288346
URL: https://svnweb.freebsd.org/changeset/base/288346
Log:
MFC r287770: MFV r277429:
Document -S option when zfs inherit fails on quota and
in manual pages.
Illumos ZFS issues:
5410 Document -S option to zfs inherit
https://illumos.org/issues/5410
5412 Mention -S option when zfs inherit fails on quota
https://illumos.org/issues/5412
illumos/illumos-gate@5ff8cfa92ec8ea0f8593ad21aa2a04829b0ef5ea
Modified:
stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8
stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Sep 28 18:39:21
2015 (r288345)
+++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Mon Sep 28 18:58:27
2015 (r288346)
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd July 30, 2015
+.Dd September 14, 2015
.Dt ZFS 8
.Os
.Sh NAME
@@ -2126,7 +2126,8 @@ Property name
.It value
Property value
.It source
-Property source. Can either be local, default, temporary, inherited, or none
+Property source. Can either be local, default, temporary, inherited, received,
+or none
(\&-).
.El
.Pp
@@ -2192,8 +2193,11 @@ The default value is all sources.
.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot Ns ...
.Xc
.Pp
-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
+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
+.Fl S
+option reverted to the received value if one exists.
+See the
.Qq Sx Properties
section for a listing of default values, and details on which properties can be
inherited.
@@ -2201,8 +2205,10 @@ inherited.
.It Fl r
Recursively inherit the given property for all children.
.It Fl S
-For properties with a received value, revert to this value. This flag has no
-effect on properties that do not have a received value.
+Revert the property to the received value if one exists; otherwise operate as
+if the
+.Fl S
+option was not specified.
.El
.It Xo
.Nm
Modified: stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Sep 28
18:39:21 2015 (r288345)
+++ stable/10/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Sep 28
18:58:27 2015 (r288346)
@@ -1927,9 +1927,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 ||
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
