svn commit: r325536 - in stable/11: cddl/contrib/opensolaris/cmd/zfs sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Andriy Gapon
avg at FreeBSD.org
Wed Nov 8 09:15:11 UTC 2017
Author: avg
Date: Wed Nov 8 09:15:09 2017
New Revision: 325536
URL: https://svnweb.freebsd.org/changeset/base/325536
Log:
MFC r324170: MFV r323794: 8605 zfs channel programs: zfs.exists undocumented and non-working
Modified:
stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8
stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8
==============================================================================
--- stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8 Wed Nov 8 09:11:49 2017 (r325535)
+++ stable/11/cddl/contrib/opensolaris/cmd/zfs/zfs-program.8 Wed Nov 8 09:15:09 2017 (r325536)
@@ -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: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp.c Wed Nov 8 09:11:49 2017 (r325535)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp.c Wed Nov 8 09:15:09 2017 (r325536)
@@ -717,7 +717,7 @@ zcp_exists(lua_State *state)
return (luaL_error(state, "unexpected error %d", error));
}
- return (0);
+ return (1);
}
/*
More information about the svn-src-all
mailing list