diff options
author | Richard Lowe <richlowe@richlowe.net> | 2011-11-08 17:01:06 -0500 |
---|---|---|
committer | Richard Lowe <richlowe@richlowe.net> | 2011-11-08 17:01:06 -0500 |
commit | 8ac09fcebf848c31516b15ce92861de4b2f514e8 (patch) | |
tree | 15f875666889194a611f93f451d6996168ed6c67 /usr/src/lib/libzfs/common/libzfs_impl.h | |
parent | 36a00406f380da1f3fd86e1a6af2de4d9f64633c (diff) | |
download | illumos-gate-8ac09fcebf848c31516b15ce92861de4b2f514e8.tar.gz |
backout 1644/1645/1646/1647/1708: Breaks 'zfs snapshot', boot environments
Diffstat (limited to 'usr/src/lib/libzfs/common/libzfs_impl.h')
-rw-r--r-- | usr/src/lib/libzfs/common/libzfs_impl.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_impl.h b/usr/src/lib/libzfs/common/libzfs_impl.h index b1eae47ed2..c9b09a2050 100644 --- a/usr/src/lib/libzfs/common/libzfs_impl.h +++ b/usr/src/lib/libzfs/common/libzfs_impl.h @@ -21,7 +21,6 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2011 by Delphix. All rights reserved. */ #ifndef _LIBFS_IMPL_H @@ -116,7 +115,7 @@ struct zpool_handle { diskaddr_t zpool_start_block; }; -typedef enum { +typedef enum { PROTO_NFS = 0, PROTO_SMB = 1, PROTO_END = 2 @@ -148,7 +147,6 @@ int zpool_standard_error_fmt(libzfs_handle_t *, int, const char *, ...); int get_dependents(libzfs_handle_t *, boolean_t, const char *, char ***, size_t *); -zfs_handle_t *make_dataset_handle_zc(libzfs_handle_t *, zfs_cmd_t *); int zprop_parse_value(libzfs_handle_t *, nvpair_t *, int, zfs_type_t, |