diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-07-18 09:16:47 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-07-18 09:16:47 +0000 |
| commit | 77225241cd47b9d06c05bd568fc057328c0c65e5 (patch) | |
| tree | 7b21d952f88eed0f80743c1b974b35495a428e72 /lib/libzfs/common/libzfs_impl.h | |
| parent | 5bb19a17c049cd92ccbd811a6bd0daf69ac899c1 (diff) | |
| parent | 93a00b0821525e25814cd720fafd04d600811c28 (diff) | |
Notes
Diffstat (limited to 'lib/libzfs/common/libzfs_impl.h')
| -rw-r--r-- | lib/libzfs/common/libzfs_impl.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/libzfs/common/libzfs_impl.h b/lib/libzfs/common/libzfs_impl.h index 576b2af5d2c2..c9b09a205024 100644 --- a/lib/libzfs/common/libzfs_impl.h +++ b/lib/libzfs/common/libzfs_impl.h @@ -21,11 +21,10 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. */ -#ifndef _LIBZFS_IMPL_H -#define _LIBZFS_IMPL_H +#ifndef _LIBFS_IMPL_H +#define _LIBFS_IMPL_H #include <sys/dmu.h> #include <sys/fs/zfs.h> @@ -36,7 +35,6 @@ #include <libuutil.h> #include <libzfs.h> #include <libshare.h> -#include <libzfs_core.h> #include <fm/libtopo.h> @@ -68,6 +66,7 @@ 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 */ @@ -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, @@ -213,4 +211,4 @@ extern void libzfs_fru_clear(libzfs_handle_t *, boolean_t); } #endif -#endif /* _LIBZFS_IMPL_H */ +#endif /* _LIBFS_IMPL_H */ |