From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 01:36:48 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 903509F1; Fri, 17 Apr 2015 01:36:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7B8787C9; Fri, 17 Apr 2015 01:36:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H1amhZ015106; Fri, 17 Apr 2015 01:36:48 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H1amuO015104; Fri, 17 Apr 2015 01:36:48 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504170136.t3H1amuO015104@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 01:36:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281637 - user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2015 01:36:48 -0000 Author: delphij Date: Fri Apr 17 01:36:47 2015 New Revision: 281637 URL: https://svnweb.freebsd.org/changeset/base/281637 Log: MFV r277429: Document -S option in zfs(8). Mention -S option when zfs inherit fails on quota. Illumos issues: 5410 Document -S option to zfs inherit 5412 Mention -S option when zfs inherit fails on quota Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs.8 user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Directory Properties: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/ (props changed) user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/ (props changed) Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs.8 ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Apr 17 01:22:43 2015 (r281636) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Fri Apr 17 01:36:47 2015 (r281637) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 12, 2014 +.Dd April 16, 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 @@ -2181,7 +2182,7 @@ displays only snapshots. 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: -.Sy local,default,inherited,temporary,received,none . +.Sy local,default,inherited,received,temporary,none . The default value is all sources. .El .It Xo @@ -2192,8 +2193,10 @@ 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. @@ -3396,6 +3399,16 @@ property from their parent. .Bd -literal -offset 2n .Li # Ic zfs inherit checksum pool/home/bob pool/home/anne .Ed +.Pp +The following command causes +.Em pool/name/bob +to revert to the received +value for the +.Sy quota +property if it exists. +.Bd -literal -offset 2n +.Li # Ic zfs inherit -S quota pool/home/bob +.Ed .It Sy Example 12 No Remotely Replicating Tn ZFS No Data .Pp The following commands send a full stream and then an incremental stream to a Modified: user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Apr 17 01:22:43 2015 (r281636) +++ user/delphij/zfs-arc-rebase/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Fri Apr 17 01:36:47 2015 (r281637) @@ -1908,9 +1908,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 ||