From owner-svn-src-all@freebsd.org Fri Apr 14 17:59:11 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2325D3E1C3; Fri, 14 Apr 2017 17:59:11 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 8A0A77E3; Fri, 14 Apr 2017 17:59:11 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3EHxAc5057260; Fri, 14 Apr 2017 17:59:10 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3EHxApZ057259; Fri, 14 Apr 2017 17:59:10 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201704141759.v3EHxApZ057259@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Fri, 14 Apr 2017 17:59:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r316888 - vendor/illumos/dist/man/man1m X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Apr 2017 17:59:11 -0000 Author: avg Date: Fri Apr 14 17:59:10 2017 New Revision: 316888 URL: https://svnweb.freebsd.org/changeset/base/316888 Log: 7276 zfs(1m) manpage could better describe space properties illumos/illumos-gate@5749c35234ed96d3a61ee7c44d2ef37e043c7c59 https://github.com/illumos/illumos-gate/commit/5749c35234ed96d3a61ee7c44d2ef37e043c7c59 https://www.illumos.org/issues/7276 The "used" and "written" properties could be described better by the zfs.1m manpage. "written" could be better described as "The amount of space referenced by this dataset, that was written since the previous snapshot (i.e. that is not referenced by the previous snapshot)." The "used" section needs more work, but at a minimum it could say that the "used" space of a snapshot is the space unique to the snapshot (i.e. the space referenced only by this snapshot). The "used" space of a snapshot is a subset of the "written" space of the snapshot. Reviewed by: Dan Kimmel Reviewed by: Matthew Ahrens Reviewed by: Robert Mustacchi Approved by: Richard Lowe Author: Pavel Zakharov Modified: vendor/illumos/dist/man/man1m/zfs.1m Modified: vendor/illumos/dist/man/man1m/zfs.1m ============================================================================== --- vendor/illumos/dist/man/man1m/zfs.1m Fri Apr 14 17:58:31 2017 (r316887) +++ vendor/illumos/dist/man/man1m/zfs.1m Fri Apr 14 17:59:10 2017 (r316888) @@ -21,7 +21,7 @@ .\" .\" Copyright (c) 2009 Sun Microsystems, Inc. All Rights Reserved. .\" Copyright 2011 Joshua M. Clulow -.\" Copyright (c) 2011, 2015 by Delphix. All rights reserved. +.\" Copyright (c) 2011, 2016 by Delphix. All rights reserved. .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved. .\" Copyright (c) 2014, Joyent, Inc. All rights reserved. .\" Copyright (c) 2014 by Adam Stevko. All rights reserved. @@ -615,22 +615,27 @@ The amount of space consumed by this dat the value that is checked against this dataset's quota and reservation. The space used does not include this dataset's reservation, but does take into account the reservations of any descendent datasets. The amount of space that a -dataset consumes from its parent, as well as the amount of space that are freed +dataset consumes from its parent, as well as the amount of space that is freed if this dataset is recursively destroyed, is the greater of its space used and its reservation. .Pp -When snapshots +The used space of a snapshot .Po see the .Sx Snapshots section .Pc -are created, their space is initially shared between the snapshot and -the file system, and possibly with previous snapshots. As the file system -changes, space that was previously shared becomes unique to the snapshot, and -counted in the snapshot's space used. Additionally, deleting snapshots can -increase the amount of space unique to -.Pq and used by -other snapshots. +is space that is referenced exclusively by this snapshot. If this snapshot is +destroyed, the amount of +.Sy used +space will be freed. Space that is shared by multiple snapshots isn't accounted +for in this metric. When a snapshot is destroyed, space that was previously +shared with this snapshot can become unique to snapshots adjacent to it, thus +changing the used space of those snapshots. The used space of the latest +snapshot can also be affected by changes in the file system. Note that the +.Sy used +space of a snapshot is a subset of the +.Sy written +space of the snapshot. .Pp The amount of space used, available, or referenced does not take into account pending changes. Pending changes are generally accounted for within a few @@ -754,8 +759,10 @@ for volumes is 8 Kbytes. Any power of 2 This property can also be referred to by its shortened column name, .Sy volblock . .It Sy written -The amount of +The amount of space .Sy referenced +by this dataset, that was written since the previous snapshot +.Pq i.e. that is not referenced by the previous snapshot . space written to this dataset since the previous snapshot. .It Sy written Ns @ Ns Em snapshot The amount of