git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'zil-performance'
[zfs.git]
/
include
/
libzfs_impl.h
diff --git
a/include/libzfs_impl.h
b/include/libzfs_impl.h
index
2389b78
..
fabcb11
100644
(file)
--- a/
include/libzfs_impl.h
+++ b/
include/libzfs_impl.h
@@
-21,6
+21,7
@@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011 by Delphix. All rights reserved.
*/
#ifndef _LIBFS_IMPL_H
*/
#ifndef _LIBFS_IMPL_H
@@
-119,7
+120,7
@@
struct zpool_handle {
diskaddr_t zpool_start_block;
};
diskaddr_t zpool_start_block;
};
-typedef
enum {
+typedef enum {
PROTO_NFS = 0,
PROTO_SMB = 1,
PROTO_END = 2
PROTO_NFS = 0,
PROTO_SMB = 1,
PROTO_END = 2
@@
-151,7
+152,8
@@
int zpool_standard_error_fmt(libzfs_handle_t *, int, const char *, ...);
int get_dependents(libzfs_handle_t *, boolean_t, const char *, char ***,
size_t *);
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 *);
+zfs_handle_t *make_dataset_simple_handle_zc(zfs_handle_t *, zfs_cmd_t *);
int zprop_parse_value(libzfs_handle_t *, nvpair_t *, int, zfs_type_t,
nvlist_t *, char **, uint64_t *, const char *);
int zprop_parse_value(libzfs_handle_t *, nvpair_t *, int, zfs_type_t,
nvlist_t *, char **, uint64_t *, const char *);