svn commit: r324170 - in head: cddl/contrib/opensolaris/cmd/zfs sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Sun Oct  1 16:51:05 2017
New Revision: 324170
URL: https://svnweb.freebsd.org/changeset/base/324170

Log:
  MFV r323794: 8605 zfs channel programs: zfs.exists undocumented and non-working
  
  illumos/illumos-gate at 5f39f884e2035d671ec02148fc4d8420c670bcb4
  https://github.com/illumos/illumos-gate/commit/5f39f884e2035d671ec02148fc4d8420c670bcb4
  
  https://www.illumos.org/issues/8605
    zfs.exists() in channel programs doesn't return any result, and should have a
    man page entry.
  
  Reviewed by: Paul Dagnelie <pcd at delphix.com>
  Reviewed by: Dan Kimmel <dan.kimmel at delphix.com>
  Reviewed by: Matt Ahrens <mahrens at delphix.com>
  Approved by: Robert Mustacchi <rm at joyent.com>
  Author: Chris Williamson <chris.williamson at delphix.com>
  
  MFC after:	5 weeks
  X-MFC after:	r324163

Modified:
  head/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8	Sun Oct  1 16:48:36 2017	(r324169)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8	Sun Oct  1 16:51:05 2017	(r324170)
@@ -289,6 +289,18 @@ msg (string)
 .Bd -ragged -compact -offset "xxxx"
 Debug message to be printed.
 .Ed
+.It Em zfs.exists(dataset)
+Returns true if the given dataset exists, or false if it doesn't.
+A fatal error will be thrown if the dataset is not in the target pool.
+That is, in a channel program running on rpool,
+zfs.exists("rpool/nonexistent_fs") returns false, but
+zfs.exists("somepool/fs_that_may_exist") will error.
+.Pp
+dataset (string)
+.Bd -ragged -compact -offset "xxxx"
+Dataset to check for existence.
+Must be in the target pool.
+.Ed
 .It Em zfs.get_prop(dataset, property)
 Returns two values.
 First, a string, number or table containing the property value for the given

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp.c	Sun Oct  1 16:48:36 2017	(r324169)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp.c	Sun Oct  1 16:51:05 2017	(r324170)
@@ -717,7 +717,7 @@ zcp_exists(lua_State *state)
 		return (luaL_error(state, "unexpected error %d", error));
 	}
 
-	return (0);
+	return (1);
 }
 
 /*