svn commit: r240949 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor-sys/illumos/dist/uts/common/fs/zfs/sys vendor/illumos/dist/cmd/zfs vendor/illumos/dist/man/man1m

[Martin Matuska]

Author: mm
Date: Wed Sep 26 08:57:12 2012
New Revision: 240949
URL: http://svn.freebsd.org/changeset/base/240949

Log:
  Update vendor/illumos/dist and vendor-sys/illumos/dist
  to illumos-gate 13836:37bf491c434c
  (illumos ZFS issues #2678, #2811, #3139, #3189, #3208)

Modified:
  vendor/illumos/dist/cmd/zfs/zfs_main.c
  vendor/illumos/dist/man/man1m/zfs.1m

Changes in other areas also in this revision:
Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/sa_impl.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_vfsops.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/zfs_znode.c

Modified: vendor/illumos/dist/cmd/zfs/zfs_main.c
==============================================================================
--- vendor/illumos/dist/cmd/zfs/zfs_main.c	Wed Sep 26 07:09:15 2012	(r240948)
+++ vendor/illumos/dist/cmd/zfs/zfs_main.c	Wed Sep 26 08:57:12 2012	(r240949)
@@ -252,7 +252,7 @@ get_usage(zfs_help_t idx)
 	case HELP_ROLLBACK:
 		return (gettext("\trollback [-rRf] <snapshot>\n"));
 	case HELP_SEND:
-		return (gettext("\tsend [-DnPpRrv] [-[iI] snapshot] "
+		return (gettext("\tsend [-DnPpRv] [-[iI] snapshot] "
 		    "<snapshot>\n"));
 	case HELP_SET:
 		return (gettext("\tset <property=value> "

Modified: vendor/illumos/dist/man/man1m/zfs.1m
==============================================================================
--- vendor/illumos/dist/man/man1m/zfs.1m	Wed Sep 26 07:09:15 2012	(r240948)
+++ vendor/illumos/dist/man/man1m/zfs.1m	Wed Sep 26 08:57:12 2012	(r240949)
@@ -26,7 +26,7 @@
 .\" Copyright (c) 2012, Joyent, Inc. All rights reserved.
 .\" Copyright 2012 Nexenta Systems, Inc. All Rights Reserved.
 .\"
-.TH ZFS 1M "Aug 16, 2012"
+.TH ZFS 1M "Sep 16, 2012"
 .SH NAME
 zfs \- configures ZFS file systems
 .SH SYNOPSIS
@@ -886,14 +886,14 @@ This property is not inherited.
 .sp
 .ne 2
 .na
-\fB\fBchecksum\fR=\fBon\fR | \fBoff\fR | \fBfletcher2,\fR| \fBfletcher4\fR |
+\fB\fBchecksum\fR=\fBon\fR | \fBoff\fR | \fBfletcher2\fR | \fBfletcher4\fR |
 \fBsha256\fR\fR
 .ad
 .sp .6
 .RS 4n
 Controls the checksum used to verify data integrity. The default value is
 \fBon\fR, which automatically selects an appropriate algorithm (currently,
-\fBfletcher2\fR, but this may change in future releases). The value \fBoff\fR
+\fBfletcher4\fR, but this may change in future releases). The value \fBoff\fR
 disables integrity checking on user data. Disabling checksums is \fBNOT\fR a
 recommended practice.
 .sp
@@ -2733,7 +2733,7 @@ Unshare the specified filesystem. The co
 .sp
 .ne 2
 .na
-\fBzfs send\fR [\fB-DnPpRrv\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR
+\fBzfs send\fR [\fB-DnPpRv\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR
 .ad
 .sp .6
 .RS 4n
@@ -2809,18 +2809,6 @@ will be much better if the filesystem us
 .sp
 .ne 2
 .na
-\fB\fB-r\fR\fR
-.ad
-.sp .6
-.RS 4n
-Recursively send all descendant snapshots.  This is similar to the \fB-R\fR
-flag, but information about deleted and renamed datasets is not included, and
-property information is only included if the \fB-p\fR flag is specified.
-.RE
-
-.sp
-.ne 2
-.na
 \fB\fB-p\fR\fR
 .ad
 .sp .6