summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2012-09-26 09:37:58 +0000
committermm <mm@FreeBSD.org>2012-09-26 09:37:58 +0000
commite0125673c3366f5bcd214cc0ce608d4a18cfd401 (patch)
treef0e2a61c166065d1911f8b078891bd21c9d89d60 /cddl
parentc5b2970fc8a1ec3ef52e09770f11c01519e81a49 (diff)
downloadFreeBSD-src-e0125673c3366f5bcd214cc0ce608d4a18cfd401.zip
FreeBSD-src-e0125673c3366f5bcd214cc0ce608d4a18cfd401.tar.gz
Merge recent vendor changes in ZFS.
Illumos issued covered: 2811 missing implementation: zfs send -r 3139 zdb dies when it tries to determine path of unlinked file 3189 kernel panic in ZFS test suite during hotspare_onoffline_004_neg 3208 moving zpool cross-endian results in incorrect user/group accounting References: https://www.illumos.org/issues/ + [issue_id] Obtained from: illumos (vendor/illumos, vendor/illumos-sys) MFC after: 2 weeks
Diffstat (limited to 'cddl')
-rw-r--r--cddl/contrib/opensolaris/cmd/zfs/zfs.811
-rw-r--r--cddl/contrib/opensolaris/cmd/zfs/zfs_main.c2
2 files changed, 3 insertions, 10 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
index 64a67e9..45bd72f0 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
@@ -174,7 +174,7 @@
.Fl a | Ar filesystem Ns | Ns Ar mountpoint
.Nm
.Cm send
-.Op Fl DnPpRrv
+.Op Fl DnPpRv
.Op Fl i Ar snapshot | Fl I Ar snapshot
.Ar snapshot
.Nm
@@ -2196,7 +2196,7 @@ file system shared on the system.
.It Xo
.Nm
.Cm send
-.Op Fl DnPpRrv
+.Op Fl DnPpRv
.Op Fl i Ar snapshot | Fl I Ar snapshot
.Ar snapshot
.Xc
@@ -2269,13 +2269,6 @@ be used regardless of the dataset's
property, but performance will be much better if the filesystem uses a
dedup-capable checksum (eg.
.Sy sha256 ) .
-.It Fl r
-Recursively send all descendant snapshots. This is similar to the
-.Fl R
-flag, but information about deleted and renamed datasets is not included, and
-property information is only included if the
-.Fl p
-flag is specified.
.It Fl p
Include the dataset's properties in the stream. This flag is implicit when
.Fl R
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
index ea313ba..1dfc82d 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
@@ -267,7 +267,7 @@ get_usage(zfs_help_t idx)
case HELP_ROLLBACK:
return (gettext("\trollback [-rRf] <snapshot>\n"));
case HELP_SEND:
- return (gettext("\tsend [-DnPpRrv] "
+ return (gettext("\tsend [-DnPpRv] "
"[-i snapshot | -I snapshot] <snapshot>\n"));
case HELP_SET:
return (gettext("\tset <property=value> "
OpenPOWER on IntegriCloud