[illumos-gate merge]

commit daefc4e3f903d9fdcba459a512dc09df2d416e91
    9349 dnet: this statement may fall through
commit f22cbd2db87ae3945ed6a9166f8b9d61b65c6ab9
    9348 mii: duplicate 'const' declaration specifier
commit 9f7e0c70988ceb8fe0dc3b631ab169a6af80ecc5
    9347 c2audit: comparison between pointer and zero character constant
commit cf95dd1699b88778bfda4b3d97e13237466400c4
    9343 ib: comparison between pointer and zero character constant
commit ae7a42b1202d66a3f5538a09de0a28329264fd15
    9181 ipf: this use of "defined" may not be portable
commit fff695d46af8deb863236b0569e68ea5a9bb6756
    9308 mdnsd: this statement may fall through
commit c15ff06a5cef5880e0afc02c7a87c6b22455f848
    9307 rdist: this statement may fall through
commit f6b0cb17c5dc44ae872c22ebbbd2663c98723311
    9306 pppd: this use of "defined" may not be portable
commit 5b85b345b049f7f7544f27a5b5e2b1bfa91da91e
    9305 pppdump: this statement may fall through
commit 7f24fc96855e7e749ca4e15ffdce8ea80fc94dbf
    9131 regexp.h: this statement may fall through
commit acca861ce6b8e9720b720b04d3880f44a3e10281
    9301 nvme: Package description out of date
commit 6f9a31a96454e5a48ab600f85d7e8b556b897e1a
    9263 rdc: comparison between pointer and zero character constant
commit 73ff8cc657529b1dc6066efa02507cc59523bf46
    9240 nxge: this statement may fall through
commit ea60f77b8bdb7a88d6143d8bd30ddebab992abee
    9142 libxcurses: comparison between pointer and zero character constant
commit 17f11284b49b98353b5119463254074fd9bc0a28
    9238 ZFS Spacemap Encoding V2
commit 1c10ae76c0cb31326c320e7cef1d3f24a1f47125
    9286 want refreservation=auto

1 files changed, 39 insertions, 5 deletions

diff --git a/usr/src/man/man1m/zfs.1m b/usr/src/man/man1m/zfs.1m
index 70ae935ed9..8d913a9855 100644
--- a/usr/src/man/man1m/zfs.1m
+++ b/usr/src/man/man1m/zfs.1m
@@ -27,6 +27,7 @@
 .\" Copyright (c) 2014 by Adam Stevko. All rights reserved.
 .\" Copyright (c) 2014 Integros [integros.com]
 .\" Copyright 2017 Nexenta Systems, Inc.
+.\" Copyright 2018 Joyent, Inc.
 .\"
 .Dd December 6, 2017
 .Dt ZFS 1M
@@ -1345,7 +1346,7 @@ Limits the amount of space a dataset can consume.
 This property enforces a hard limit on the amount of space used.
 This hard limit does not include space used by descendents, including file
 systems and snapshots.
-.It Sy refreservation Ns = Ns Em size Ns | Ns Sy none
+.It Sy refreservation Ns = Ns Em size Ns | Ns Sy none Ns | Ns Sy auto
 The minimum amount of space guaranteed to a dataset, not including its
 descendents.
 When the amount of space used is below this value, the dataset is treated as if
@@ -1363,6 +1364,22 @@ this reservation to accommodate the current number of
 .Qq referenced
 bytes in the dataset.
 .Pp
+If
+.Sy refreservation
+is set to
+.Sy auto ,
+a volume is thick provisioned
+.Po or
+.Qq not sparse
+.Pc .
+.Sy refreservation Ns = Ns Sy auto
+is only supported on volumes.
+See
+.Sy volsize
+in the
+.Sx Native Properties
+section for more information about sparse volumes.
+.Pp
 This property can also be referred to by its shortened column name,
 .Sy refreserv .
 .It Sy reservation Ns = Ns Em size Ns | Ns Sy none
@@ -1577,22 +1594,39 @@ Extreme care should be used when adjusting the volume size.
 Though not recommended, a
 .Qq sparse volume
 .Po also known as
-.Qq thin provisioning
+.Qq thin provisioned
 .Pc
 can be created by specifying the
 .Fl s
 option to the
 .Nm zfs Cm create Fl V
-command, or by changing the reservation after the volume has been created.
+command, or by changing the value of the
+.Sy refreservation
+property
+.Po or
+.Sy reservation
+property on pool version 8 or earlier
+.Pc
+after the volume has been created.
 A
 .Qq sparse volume
-is a volume where the reservation is less then the volume size.
+is a volume where the value of
+.Sy refreservation
+is less than the size of the volume plus the space required to store its
+metadata.
 Consequently, writes to a sparse volume can fail with
 .Er ENOSPC
 when the pool is low on space.
 For a sparse volume, changes to
 .Sy volsize
-are not reflected in the reservation.
+are not reflected in the
+.Sy refreservation.
+A volume that is not sparse is said to be
+.Qq thick provisioned .
+A sparse volume can become thick provisioned by setting
+.Sy refreservation
+to
+.Sy auto .
 .It Sy vscan Ns = Ns Sy on Ns | Ns Sy off
 Controls whether regular files should be scanned for viruses when a file is
 opened and closed.