Imported Upstream version 0.6.5.3

[mirror_zfs-debian.git] / include / libzfs_impl.h

diff --git a/include/libzfs_impl.h b/include/libzfs_impl.h
index fabcb11831441231351f172fcf8d82f96dffcbbc..e805e3ee70455f60b2ce76ff6f7b32dd84a5b136 100644 (file)
--- a/include/libzfs_impl.h
+++ b/include/libzfs_impl.h
@@ -21,11 +21,11 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
-#ifndef        _LIBFS_IMPL_H
-#define        _LIBFS_IMPL_H
+#ifndef        _LIBZFS_IMPL_H
+#define        _LIBZFS_IMPL_H
 
 #include <sys/dmu.h>
 #include <sys/fs/zfs.h>
@@ -36,6 +36,7 @@
 #include <libuutil.h>
 #include <libzfs.h>
 #include <libshare.h>
+#include <libzfs_core.h>
 
 #if defined(HAVE_LIBTOPO)
 #include <fm/libtopo.h>
@@ -69,7 +70,6 @@ struct libzfs_handle {
        int libzfs_desc_active;
        char libzfs_action[1024];
        char libzfs_desc[1024];
-       char *libzfs_log_str;
        int libzfs_printerr;
        int libzfs_storeerr; /* stuff error messages into buffer */
        void *libzfs_sharehdl; /* libshare handle */
@@ -190,11 +190,11 @@ int create_parents(libzfs_handle_t *, char *, int);
 boolean_t isa_child_of(const char *dataset, const char *parent);
 
 zfs_handle_t *make_dataset_handle(libzfs_handle_t *, const char *);
+zfs_handle_t *make_bookmark_handle(zfs_handle_t *, const char *,
+    nvlist_t *props);
 
 int zpool_open_silent(libzfs_handle_t *, const char *, zpool_handle_t **);
 
-int zvol_create_link(libzfs_handle_t *, const char *);
-int zvol_remove_link(libzfs_handle_t *, const char *);
 boolean_t zpool_name_valid(libzfs_handle_t *, boolean_t, const char *);
 
 int zfs_validate_name(libzfs_handle_t *hdl, const char *path, int type,
@@ -219,4 +219,4 @@ extern void libzfs_fru_clear(libzfs_handle_t *, boolean_t);
 }
 #endif
 
-#endif /* _LIBFS_IMPL_H */
+#endif /* _LIBZFS_IMPL_H */