summaryrefslogtreecommitdiff
path: root/usr/src/lib/libzfs/common/mapfile-vers
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2016-02-23 13:25:43 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2016-02-23 13:25:43 +0000
commitd3d31ab6f2a28d67593b8dcad42c0f03964ab6c0 (patch)
tree9f6711836b72b99b8d94d2300e585e659d35b984 /usr/src/lib/libzfs/common/mapfile-vers
parent3f9daf6d27ccf52cc878e4bee17bf6f657f6f50d (diff)
parente014e7f89c5273294b22953615734b04c11b1b4f (diff)
downloadillumos-joyent-d3d31ab6f2a28d67593b8dcad42c0f03964ab6c0.tar.gz
[illumos-gate merge]
commit e014e7f89c5273294b22953615734b04c11b1b4f 6641 deadman fires spuriously when running on VMware commit 8808ac5dae118369991f158b6ab736cb2691ecde 4521 zfstest is trying to execute evil "zfs unmount -a"
Diffstat (limited to 'usr/src/lib/libzfs/common/mapfile-vers')
-rw-r--r--usr/src/lib/libzfs/common/mapfile-vers8
1 files changed, 7 insertions, 1 deletions
diff --git a/usr/src/lib/libzfs/common/mapfile-vers b/usr/src/lib/libzfs/common/mapfile-vers
index f348bf03ab..7c6bcb0fab 100644
--- a/usr/src/lib/libzfs/common/mapfile-vers
+++ b/usr/src/lib/libzfs/common/mapfile-vers
@@ -18,10 +18,14 @@
#
# CDDL HEADER END
#
+
+#
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2011 Nexenta Systems, Inc. All rights reserved.
# Copyright (c) 2011, 2014 by Delphix. All rights reserved.
# Copyright (c) 2012, Joyent, Inc. All rights reserved.
+# Copyright 2016 Nexenta Systems, Inc.
+#
+
#
# MAPFILE HEADER START
#
@@ -80,6 +84,7 @@ SYMBOL_VERSION SUNWprivate_1.1 {
zfs_get_hole_count;
zfs_get_name;
zfs_get_pool_handle;
+ zfs_get_pool_name;
zfs_get_user_props;
zfs_get_type;
zfs_handle_dup;
@@ -233,6 +238,7 @@ SYMBOL_VERSION SUNWprivate_1.1 {
zpool_scan;
zpool_search_import;
zpool_set_prop;
+ zpool_skip_pool;
zpool_state_to_name;
zpool_unmount_datasets;
zpool_upgrade;