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

[Andriy Gapon]

Author: avg
Date: Fri Sep 22 08:15:35 2017
New Revision: 323912
URL: https://svnweb.freebsd.org/changeset/base/323912

Log:
  8592 ZFS channel programs - rollback
  
  illumos/illumos-gate at 000cce6b6fad4a8b0eecef6e1251f6aca1719c55
  https://github.com/illumos/illumos-gate/commit/000cce6b6fad4a8b0eecef6e1251f6aca1719c55
  
  https://www.illumos.org/issues/8592
    ZFS channel programs should be able to perform a rollback. This logic will
    probably look pretty similar to zfs.sync.destroy().
  
  Reviewed by: Chris Williamson <chris.williamson at delphix.com>
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Approved by: Robert Mustacchi <rm at joyent.com>
  Author: Brad Lewis <brad.lewis at delphix.com>

Modified:
  vendor/illumos/dist/man/man1m/zfs-program.1m

Changes in other areas also in this revision:
Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dsl_dataset.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/sys/dsl_dataset.h
  vendor-sys/illumos/dist/uts/common/fs/zfs/zcp_synctask.c

Modified: vendor/illumos/dist/man/man1m/zfs-program.1m
==============================================================================
--- vendor/illumos/dist/man/man1m/zfs-program.1m	Fri Sep 22 08:13:09 2017	(r323911)
+++ vendor/illumos/dist/man/man1m/zfs-program.1m	Fri Sep 22 08:15:35 2017	(r323912)
@@ -8,7 +8,7 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
-.\" Copyright (c) 2016 by Delphix. All Rights Reserved.
+.\" Copyright (c) 2016, 2017 by Delphix. All rights reserved.
 .\"
 .Dd January 21, 2016
 .Dt ZFS-PROGRAM 1M
@@ -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