diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2013-03-01 21:01:45 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2013-03-01 21:01:45 +0000 |
| commit | 577227be9d7e7e691365c6df7c2c70a0cd5c0d96 (patch) | |
| tree | 019ac6a39f50b650c1907965f081edb16c3479b4 /lib/libzfs/common/libzfs.h | |
| parent | b9192d31aabb73ffd7d70eb6dd383aa9f924dc0a (diff) | |
| download | src-577227be9d7e7e691365c6df7c2c70a0cd5c0d96.tar.gz src-577227be9d7e7e691365c6df7c2c70a0cd5c0d96.zip | |
Update vendor/illumos/dist and vendor-sys/illumos/dist
to illumos-gate 13973:4972ab336f54
Illumos ZFS issues:
3464 zfs synctask code needs restructuring
Notes
Notes:
svn path=/vendor-sys/illumos/dist/; revision=247580
Diffstat (limited to 'lib/libzfs/common/libzfs.h')
| -rw-r--r-- | lib/libzfs/common/libzfs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libzfs/common/libzfs.h b/lib/libzfs/common/libzfs.h index 49c86dd18f7c..4d1e8186d286 100644 --- a/lib/libzfs/common/libzfs.h +++ b/lib/libzfs/common/libzfs.h @@ -550,7 +550,7 @@ extern int zfs_create(libzfs_handle_t *, const char *, zfs_type_t, extern int zfs_create_ancestors(libzfs_handle_t *, const char *); extern int zfs_destroy(zfs_handle_t *, boolean_t); extern int zfs_destroy_snaps(zfs_handle_t *, char *, boolean_t); -extern int zfs_destroy_snaps_nvl(zfs_handle_t *, nvlist_t *, boolean_t); +extern int zfs_destroy_snaps_nvl(libzfs_handle_t *, nvlist_t *, boolean_t); extern int zfs_clone(zfs_handle_t *, const char *, nvlist_t *); extern int zfs_snapshot(libzfs_handle_t *, const char *, boolean_t, nvlist_t *); extern int zfs_snapshot_nvl(libzfs_handle_t *hdl, nvlist_t *snaps, @@ -593,8 +593,8 @@ extern int zfs_send(zfs_handle_t *, const char *, const char *, sendflags_t *, int, snapfilter_cb_t, void *, nvlist_t **); extern int zfs_promote(zfs_handle_t *); -extern int zfs_hold(zfs_handle_t *, const char *, const char *, boolean_t, - boolean_t, boolean_t, int, uint64_t, uint64_t); +extern int zfs_hold(zfs_handle_t *, const char *, const char *, + boolean_t, boolean_t, int); extern int zfs_release(zfs_handle_t *, const char *, const char *, boolean_t); extern int zfs_get_holds(zfs_handle_t *, nvlist_t **); extern uint64_t zvol_volsize_to_reservation(uint64_t, nvlist_t *); |