Deleted Added
full compact
libzfs_impl.h (205198) libzfs_impl.h (209962)
1/*
2 * CDDL HEADER SART
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 49 unchanged lines hidden (view full) ---

58 uint64_t libzfs_ns_gen;
59 int libzfs_desc_active;
60 char libzfs_action[1024];
61 char libzfs_desc[1024];
62 char *libzfs_log_str;
63 int libzfs_printerr;
64 void *libzfs_sharehdl; /* libshare handle */
65 uint_t libzfs_shareflags;
1/*
2 * CDDL HEADER SART
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 49 unchanged lines hidden (view full) ---

58 uint64_t libzfs_ns_gen;
59 int libzfs_desc_active;
60 char libzfs_action[1024];
61 char libzfs_desc[1024];
62 char *libzfs_log_str;
63 int libzfs_printerr;
64 void *libzfs_sharehdl; /* libshare handle */
65 uint_t libzfs_shareflags;
66 boolean_t libzfs_mnttab_enable;
67 avl_tree_t libzfs_mnttab_cache;
66};
67#define ZFSSHARE_MISS 0x01 /* Didn't find entry in cache */
68
69struct zfs_handle {
70 libzfs_handle_t *zfs_hdl;
71 zpool_handle_t *zpool_hdl;
72 char zfs_name[ZFS_MAXNAMELEN];
73 zfs_type_t zfs_type; /* type including snapshot */

--- 106 unchanged lines hidden (view full) ---

180/*
181 * libshare (sharemgr) interfaces used internally.
182 */
183
184extern int zfs_init_libshare(libzfs_handle_t *, int);
185extern void zfs_uninit_libshare(libzfs_handle_t *);
186extern int zfs_parse_options(char *, zfs_share_proto_t);
187
68};
69#define ZFSSHARE_MISS 0x01 /* Didn't find entry in cache */
70
71struct zfs_handle {
72 libzfs_handle_t *zfs_hdl;
73 zpool_handle_t *zpool_hdl;
74 char zfs_name[ZFS_MAXNAMELEN];
75 zfs_type_t zfs_type; /* type including snapshot */

--- 106 unchanged lines hidden (view full) ---

182/*
183 * libshare (sharemgr) interfaces used internally.
184 */
185
186extern int zfs_init_libshare(libzfs_handle_t *, int);
187extern void zfs_uninit_libshare(libzfs_handle_t *);
188extern int zfs_parse_options(char *, zfs_share_proto_t);
189
188extern int zfs_unshare_proto(zfs_handle_t *zhp,
190extern int zfs_unshare_proto(zfs_handle_t *,
189 const char *, zfs_share_proto_t *);
190
191#ifdef __FreeBSD__
192
193/*
194 * This is FreeBSD version of ioctl, because Solaris' ioctl() updates
195 * zc_nvlist_dst_size even if an error is returned, on FreeBSD if an
196 * error is returned zc_nvlist_dst_size won't be updated.

--- 24 unchanged lines hidden ---
191 const char *, zfs_share_proto_t *);
192
193#ifdef __FreeBSD__
194
195/*
196 * This is FreeBSD version of ioctl, because Solaris' ioctl() updates
197 * zc_nvlist_dst_size even if an error is returned, on FreeBSD if an
198 * error is returned zc_nvlist_dst_size won't be updated.

--- 24 unchanged lines hidden ---