summaryrefslogtreecommitdiffstats
path: root/cddl/contrib/opensolaris/cmd
diff options
context:
space:
mode:
authoravg <avg@FreeBSD.org>2017-11-08 09:16:31 +0000
committeravg <avg@FreeBSD.org>2017-11-08 09:16:31 +0000
commitbdb080c5c33ea764d11bdebcd5de1bd6b9be61c7 (patch)
tree07b6ccc6834499bc7613424ce02f40c31e84fd63 /cddl/contrib/opensolaris/cmd
parentaa4ec3e84962b8953d2bf0e3504960a5a4e19988 (diff)
downloadFreeBSD-src-bdb080c5c33ea764d11bdebcd5de1bd6b9be61c7.zip
FreeBSD-src-bdb080c5c33ea764d11bdebcd5de1bd6b9be61c7.tar.gz
MFC r324196: MFV r323912: 8592 ZFS channel programs - rollback
Diffstat (limited to 'cddl/contrib/opensolaris/cmd')
-rw-r--r--cddl/contrib/opensolaris/cmd/zfs/zfs-program.816
1 files changed, 14 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8 b/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8
index c668097..93037da 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8
@@ -8,9 +8,9 @@
.\" http://www.illumos.org/license/CDDL.
.\"
.\"
-.\" Copyright (c) 2016 by Delphix. All Rights Reserved.
+.\" Copyright (c) 2016, 2017 by Delphix. All rights reserved.
.\"
-.Dd September 28, 2017
+.Dd October 02, 2016
.Dt ZFS-PROGRAM 1M
.Os
.Sh NAME
@@ -361,6 +361,17 @@ dataset (string)
.Bd -ragged -compact -offset "xxxx"
Clone to be promoted.
.Ed
+.It Em zfs.sync.rollback(filesystem)
+Rollback to the previous snapshot for a dataset.
+Returns 0 on successful rollback, or a nonzero error code otherwise.
+Rollbacks can be performed on filesystems or zvols, but not on snapshots
+or mounted datasets.
+EBUSY is returned in the case where the filesystem is mounted.
+.Pp
+filesystem (string)
+.Bd -ragged -compact -offset "xxxx"
+Filesystem to rollback.
+.Ed
.El
.It Sy zfs.check submodule
For each function in the zfs.sync submodule, there is a corresponding zfs.check
@@ -380,6 +391,7 @@ The available zfs.check functions are:
.Bl -tag -width "xx"
.It Em zfs.check.destroy(dataset, [defer=true|false])
.It Em zfs.check.promote(dataset)
+.It Em zfs.check.rollback(filesystem)
.El
.It Sy zfs.list submodule
The zfs.list submodule provides functions for iterating over datasets and
OpenPOWER on IntegriCloud