NEX-1456 Part 2, port FreeBSD patch - new zfs recv options support
OS-103 handle CoS descriptor persistent references across vdev operations
re #8279 rb3915 need a mechanism to notify NMS about ZFS config changes (Opened code)

*** 77,86 ****
--- 77,87 ----
          int libzfs_pool_iter;
          topo_hdl_t *libzfs_topo_hdl;
          libzfs_fru_t **libzfs_fru_hash;
          libzfs_fru_t *libzfs_fru_list;
          char libzfs_chassis_id[256];
+         char *libzfs_log_str;
          boolean_t libzfs_prop_debug;
  };
  
  struct zfs_handle {
          libzfs_handle_t *zfs_hdl;
*** 144,153 ****
--- 145,156 ----
  
  int zfs_standard_error(libzfs_handle_t *, int, const char *);
  int zfs_standard_error_fmt(libzfs_handle_t *, int, const char *, ...);
  int zpool_standard_error(libzfs_handle_t *, int, const char *);
  int zpool_standard_error_fmt(libzfs_handle_t *, int, const char *, ...);
+ int zpool_vprop_standard_error(libzfs_handle_t *, int, const char *);
+ int zpool_vprop_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 *);
  zfs_handle_t *make_dataset_simple_handle_zc(zfs_handle_t *, zfs_cmd_t *);
*** 182,191 ****
--- 185,196 ----
  int changelist_unshare(prop_changelist_t *, zfs_share_proto_t *);
  int changelist_haszonedchild(prop_changelist_t *);
  
  void remove_mountpoint(zfs_handle_t *);
  int create_parents(libzfs_handle_t *, char *, int);
+ int check_parents(libzfs_handle_t *hdl, const char *path, uint64_t *zoned,
+     boolean_t accept_ancestor, int *prefixlen);
  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);
*** 208,217 ****
--- 213,223 ----
  
  extern int zfs_unshare_proto(zfs_handle_t *,
      const char *, zfs_share_proto_t *);
  
  extern void libzfs_fru_clear(libzfs_handle_t *, boolean_t);
+ extern void libzfs_log_event(libzfs_handle_t *, const char *name);
  
  #ifdef  __cplusplus
  }
  #endif