[illumos-gate merge]

commit 793ac993be490bb7c16673e5f2588c6d18672894
    11654 libipmi/Makefile.com has an invalid and unused variable substitution
commit d8109ce4330e1b8ad6c29f9fccacec969066bb9d
    11653 tools/make/bin/Makefile has an invalid and unused variable substitution
commit bdf3516c67ac96d42da6a8adc5bf9a0a5b72b060
    11652 Remove unused archive library rules from cmd/sgs
commit 2b1ff28bbd88f04a83e6ca2d284eb7be0959c43c
    11647 6026 regressed after 5980
commit 21ec5af72097881ccdcd81ebfd26e1c85b609ad6
    11662 nss_ldap: group members are not comma separated
commit aa5636e518a7c706134caf5072a16f9f85f7497a
    11633 SPARC NULL pointer errors in libprtdiag_psr
commit 3f8c0768c028803de6022c542bbd9e9e6f08289f
    11632 SPARC NULL pointer error in libtsalarm
commit 53bfe442a2e3c2938be0ac7b2b05d096689c2ea6
    11631 SPARC NULL pointer error in libds
commit 9cb0a1d4446fe891a01d01e07b2e27f0177c84cd
    11630 remove checks for 64-bit capable hardware
commit 95bfa623bf6336d9476ba272ebda6e2c2a305e6f
    10852 libficl-sys: implement loader emulator commands with linker set
commit 90ce8b937724b0472efa92ca9911002383cf25a2
    10851 want sys/linker_set.h
commit bfa93d3911fd4856c353c9b190c18cdb98fc36b4
    11610 PCI ID ambiguity leads to driver induced mayhem
    11611 pchtemp driver should use new IPD 9 aliases
commit 96fc3fdf646c403f7896ecd3e9657d0474025bba
    11617 esc fails with /usr/bin/cpp present
commit 5711d3938643272e5ca2aaf5d868e612e7bc97b6
    11640 add zpool ashift property tunable
commit 2c54ade085d70dd5a2914f0fa5cf7fe208cd36a6
    11603 smbadm has wrong exit code while listing SMB group properties
commit 69b1fd3f24d0ee2e682883606201c61f52085805
    11461 should use a native link-editor during the build
    11463 SUNWonld has passed its use-by date
    11464 cmd/sgs/tools should contain tools, not common code
    11465 sgsmsg should be built with the rest of the build tools
commit d58ceae2ed78dc65ab682a0281ce523d6c4116fe
    11646 fbt entry probes incorrectly placed due to -fshrink-wrap

	Conflicts:
	usr/src/uts/Makefile.uts

1 files changed, 45 insertions, 1 deletions

diff --git a/usr/src/man/man1m/zpool.1m b/usr/src/man/man1m/zpool.1m
index 70d3dc29d9..14e361a442 100644
--- a/usr/src/man/man1m/zpool.1m
+++ b/usr/src/man/man1m/zpool.1m
@@ -26,8 +26,9 @@
 .\" Copyright (c) 2017 Datto Inc.
 .\" Copyright (c) 2017 George Melikov. All Rights Reserved.
 .\" Copyright 2019 Joyent, Inc.
+.\" Copyright (c) 2012 Cyril Plisko. All Rights Reserved.
 .\"
-.Dd May 15, 2019
+.Dd August 30, 2019
 .Dt ZPOOL 1M
 .Os
 .Sh NAME
@@ -39,10 +40,12 @@
 .Nm
 .Cm add
 .Op Fl fgLnP
+.Oo Fl o Ar property Ns = Ns Ar value Oc
 .Ar pool vdev Ns ...
 .Nm
 .Cm attach
 .Op Fl f
+.Oo Fl o Ar property Ns = Ns Ar value Oc
 .Ar pool device new_device
 .Nm
 .Cm checkpoint
@@ -668,6 +671,31 @@ changed with the
 .Nm zpool Cm set
 command:
 .Bl -tag -width Ds
+.It Sy ashift Ns = Ns Sy ashift
+Pool sector size exponent, to the power of
+.Sy 2
+(internally referred to as
+.Sy ashift
+). Values from 9 to 16, inclusive, are valid; also, the
+value 0 (the default) means to auto-detect using the kernel's block
+layer and a ZFS internal exception list.
+I/O operations will be aligned to the specified size boundaries.
+Additionally, the minimum (disk) write size will be set to the specified size,
+so this represents a space vs performance trade-off.
+For optimal performance, the pool sector size should be greater than or equal to
+the sector size of the underlying disks.
+The typical case for setting this property is when performance is important and
+the underlying disks use 4KiB sectors but report 512B sectors to the OS (for
+compatibility reasons); in that case, set
+.Sy ashift=12
+(which is 1<<12 = 4096). When set, this property is
+used as the default hint value in subsequent vdev operations (add,
+attach and replace).
+Changing this value will not modify any existing
+vdev, not even on disk replacement; however it can be used, for
+instance, to replace a dying 512B sectors disk with a newer 4KiB
+sectors device: this will probably result in bad performance but at the
+same time could prevent loss of data.
 .It Sy autoexpand Ns = Ns Sy on Ns | Ns Sy off
 Controls automatic pool expansion when the underlying LUN is grown.
 If set to
@@ -838,6 +866,7 @@ Displays a help message.
 .Nm
 .Cm add
 .Op Fl fgLnP
+.Oo Fl o Ar property Ns = Ns Ar value Oc
 .Ar pool vdev Ns ...
 .Xc
 Adds the specified virtual devices to the given pool.
@@ -881,11 +910,19 @@ instead of only the last component of the path.
 This can be used in conjunction with the
 .Fl L
 flag.
+.It Fl o Ar property Ns = Ns Ar value
+Sets the given pool properties.
+See the
+.Sx Properties
+section for a list of valid properties that can be set.
+The only property supported at the moment is
+.Sy ashift.
 .El
 .It Xo
 .Nm
 .Cm attach
 .Op Fl f
+.Oo Fl o Ar property Ns = Ns Ar value Oc
 .Ar pool device new_device
 .Xc
 Attaches
@@ -915,6 +952,13 @@ Forces use of
 .Ar new_device ,
 even if its appears to be in use.
 Not all devices can be overridden in this manner.
+.It Fl o Ar property Ns = Ns Ar value
+Sets the given pool properties.
+See the
+.Sx Properties
+section for a list of valid properties that can be set.
+The only property supported at the moment is
+.Sy ashift.
 .El
 .It Xo
 .Nm