Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Mar 2014 01:32:25 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r263459 - in head/cddl/contrib/opensolaris/cmd: zdb zfs zpool
Message-ID:  <201403210132.s2L1WPcJ033635@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Fri Mar 21 01:32:25 2014
New Revision: 263459
URL: http://svnweb.freebsd.org/changeset/base/263459

Log:
  MFV 263436-263438:
  
    3947 zpool(1M) references nonexistent zfs-features(5)
    4540 zpool(1M) man page doesn't describe "readonly" property
    3948 zfs sync=default is not accepted
    4611 zfs(1M) still mentions 'send -r' in synopsis
    4415 zpool(1M) man page missing "import -m" description
    4570 Document dedupditto pool property
    4572 Dedup-related documentation additions for zpool and zdb.
    1371 Add -D option description to zpool(1M) manpage
    4571 Add documentation for -T and interval to "zpool list"
  
  MFC after:	2 weeks

Modified:
  head/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  head/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  head/cddl/contrib/opensolaris/cmd/zpool/zpool.8
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/   (props changed)
  head/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  head/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: head/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Fri Mar 21 01:30:33 2014	(r263458)
+++ head/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Fri Mar 21 01:32:25 2014	(r263459)
@@ -19,7 +19,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 31, 2013
+.Dd March 20, 2014
 .Dt ZDB 8
 .Os
 .Sh NAME
@@ -127,6 +127,12 @@ compression ratio (compress), inflation 
 If specified twice, display a histogram of deduplication statistics, showing
 the allocated (physically present on disk) and referenced (logically
 referenced in the pool) block counts and sizes by reference count.
+.Pp
+If specified a third time, display the statistics independently for each deduplication table.
+.Pp
+If specified a fourth time, dump the contents of the deduplication tables describing duplicate blocks.
+.Pp
+If specified a fifth time, also dump the contents of the deduplication tables describing unique blocks.
 .It Fl h
 Display pool history similar to
 .Cm zpool history ,

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Fri Mar 21 01:30:33 2014	(r263458)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Fri Mar 21 01:32:25 2014	(r263459)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 2, 2014
+.Dd March 20, 2014
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -1335,10 +1335,21 @@ features being supported, the new file s
 these properties.
 .Bl -tag -width 4n
 .It Sy casesensitivity Ns = Ns Cm sensitive | insensitive | mixed
+Indicates whether the file name matching algorithm used by the file system
+should be case-sensitive, case-insensitive, or allow a combination of both
+styles of matching. The default value for the
+.Sy casesensitivity
+property is
+.Cm sensitive .
+Traditionally, UNIX and POSIX file systems have case-sensitive file names.
+.Pp
 The
+.Cm mixed
+value for the
 .Sy casesensitivity
-property is currently not supported on
-.Fx .
+property indicates that the
+file system can support requests for both case-sensitive and case-insensitive
+matching behavior.
 .It Sy normalization Ns = Ns Cm none | formC | formD | formKC | formKD
 Indicates whether the file system should perform a
 .Sy unicode

Modified: head/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Mar 21 01:30:33 2014	(r263458)
+++ head/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Fri Mar 21 01:32:25 2014	(r263459)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 31, 2013
+.Dd March 20, 2014
 .Dt ZPOOL 8
 .Os
 .Sh NAME
@@ -624,6 +624,9 @@ Datasets of this pool can only be mounte
 .It
 To write to a read-only pool, a export and import of the pool is required.
 .El
+.Pp
+This property can also be referred to by its shortened column name,
+.Sy rdonly .
 .El
 .Pp
 The following properties can be set at creation time and import time, and later
@@ -682,7 +685,9 @@ property.
 Threshold for the number of block ditto copies. If the reference count for a
 deduplicated block increases above this number, a new ditto copy of this block
 is automatically stored. Default setting is
-.Cm 0 .
+.Cm 0
+which causes no ditto copies to be created for deduplicated blocks.
+The miniumum legal nonzero setting is 100.
 .It Sy delegation Ns = Ns Cm on No | Cm off
 Controls whether a non-privileged user is granted access based on the dataset
 permissions defined on the dataset. See
@@ -1152,9 +1157,10 @@ option is also required.
 .It Fl f
 Forces import, even if the pool appears to be potentially active.
 .It Fl m
-Enables import with missing log devices.
+Allows a pool to import when there is a missing log device. Recent transactions
+can be lost because the log device will be discarded.
 .It Fl N
-Do not mount any filesystems from the imported pool.
+Import the pool without mounting any file systems.
 .It Fl R Ar root
 Sets the
 .Qq Sy cachefile
@@ -1245,9 +1251,10 @@ option is also required.
 .It Fl f
 Forces import, even if the pool appears to be potentially active.
 .It Fl m
-Enables import with missing log devices.
+Allows a pool to import when there is a missing log device. Recent transactions
+can be lost because the log device will be discarded.
 .It Fl N
-Do not mount any filesystems from the imported pool.
+Import the pool without mounting any file systems.
 .It Fl R Ar root
 Equivalent to
 .Qq Fl o Cm cachefile=none,altroot= Ns Pa root
@@ -1336,8 +1343,9 @@ Treat exported or foreign devices as ina
 .Op Ar inverval Op Ar count
 .Xc
 .Pp
-Lists the given pools along with a health status and space usage. When given no
-arguments, all pools in the system are listed.
+Lists the given pools along with a health status and space usage. If no
+.Ar pools
+are specified, all pools in the system are listed.
 .Pp
 When given an interval, the output is printed every
 .Ar interval
@@ -1349,6 +1357,17 @@ is specified, the command exits after
 .Ar count
 reports are printed.
 .Bl -tag -width indent
+.It Fl T Cm d Ns | Ns Cm u
+Print a timestamp.
+.Pp
+Use modifier
+.Cm d
+for standard date format. See
+.Xr date 1 .
+Use modifier
+.Cm u
+for unixtime
+.Pq equals Qq Ic date +%s .
 .It Fl H
 Scripted mode. Do not display headers, and separate fields by a single tab
 instead of arbitrary space.
@@ -1677,7 +1696,7 @@ Once this is done, the pool will no long
 not support feature flags.
 See
 .Xr zpool-features 7
-for details on compatability with system sthat support feature flags, but do
+for details on compatibility with systems that support feature flags, but do
 not support all features enabled on the pool.
 .Bl -tag -width indent
 .It Fl a



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403210132.s2L1WPcJ033635>