Print this page
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)

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libzfs/common/libzfs_impl.h
          +++ new/usr/src/lib/libzfs/common/libzfs_impl.h
↓ open down ↓ 71 lines elided ↑ open up ↑
  72   72          int libzfs_printerr;
  73   73          int libzfs_storeerr; /* stuff error messages into buffer */
  74   74          void *libzfs_sharehdl; /* libshare handle */
  75   75          boolean_t libzfs_mnttab_enable;
  76   76          avl_tree_t libzfs_mnttab_cache;
  77   77          int libzfs_pool_iter;
  78   78          topo_hdl_t *libzfs_topo_hdl;
  79   79          libzfs_fru_t **libzfs_fru_hash;
  80   80          libzfs_fru_t *libzfs_fru_list;
  81   81          char libzfs_chassis_id[256];
       82 +        char *libzfs_log_str;
  82   83          boolean_t libzfs_prop_debug;
  83   84  };
  84   85  
  85   86  struct zfs_handle {
  86   87          libzfs_handle_t *zfs_hdl;
  87   88          zpool_handle_t *zpool_hdl;
  88   89          char zfs_name[ZFS_MAX_DATASET_NAME_LEN];
  89   90          zfs_type_t zfs_type; /* type including snapshot */
  90   91          zfs_type_t zfs_head_type; /* type excluding snapshot */
  91   92          dmu_objset_stats_t zfs_dmustats;
↓ open down ↓ 47 lines elided ↑ open up ↑
 139  140  void *zfs_alloc(libzfs_handle_t *, size_t);
 140  141  void *zfs_realloc(libzfs_handle_t *, void *, size_t, size_t);
 141  142  char *zfs_asprintf(libzfs_handle_t *, const char *, ...);
 142  143  char *zfs_strdup(libzfs_handle_t *, const char *);
 143  144  int no_memory(libzfs_handle_t *);
 144  145  
 145  146  int zfs_standard_error(libzfs_handle_t *, int, const char *);
 146  147  int zfs_standard_error_fmt(libzfs_handle_t *, int, const char *, ...);
 147  148  int zpool_standard_error(libzfs_handle_t *, int, const char *);
 148  149  int zpool_standard_error_fmt(libzfs_handle_t *, int, const char *, ...);
      150 +int zpool_vprop_standard_error(libzfs_handle_t *, int, const char *);
      151 +int zpool_vprop_standard_error_fmt(libzfs_handle_t *, int, const char *, ...);
 149  152  
 150  153  int get_dependents(libzfs_handle_t *, boolean_t, const char *, char ***,
 151  154      size_t *);
 152  155  zfs_handle_t *make_dataset_handle_zc(libzfs_handle_t *, zfs_cmd_t *);
 153  156  zfs_handle_t *make_dataset_simple_handle_zc(zfs_handle_t *, zfs_cmd_t *);
 154  157  
 155  158  int zprop_parse_value(libzfs_handle_t *, nvpair_t *, int, zfs_type_t,
 156  159      nvlist_t *, char **, uint64_t *, const char *);
 157  160  int zprop_expand_list(libzfs_handle_t *hdl, zprop_list_t **plp,
 158  161      zfs_type_t type);
↓ open down ↓ 18 lines elided ↑ open up ↑
 177  180  int changelist_postfix(prop_changelist_t *);
 178  181  void changelist_rename(prop_changelist_t *, const char *, const char *);
 179  182  void changelist_remove(prop_changelist_t *, const char *);
 180  183  void changelist_free(prop_changelist_t *);
 181  184  prop_changelist_t *changelist_gather(zfs_handle_t *, zfs_prop_t, int, int);
 182  185  int changelist_unshare(prop_changelist_t *, zfs_share_proto_t *);
 183  186  int changelist_haszonedchild(prop_changelist_t *);
 184  187  
 185  188  void remove_mountpoint(zfs_handle_t *);
 186  189  int create_parents(libzfs_handle_t *, char *, int);
      190 +int check_parents(libzfs_handle_t *hdl, const char *path, uint64_t *zoned,
      191 +    boolean_t accept_ancestor, int *prefixlen);
 187  192  boolean_t isa_child_of(const char *dataset, const char *parent);
 188  193  
 189  194  zfs_handle_t *make_dataset_handle(libzfs_handle_t *, const char *);
 190  195  zfs_handle_t *make_bookmark_handle(zfs_handle_t *, const char *,
 191  196      nvlist_t *props);
 192  197  
 193  198  int zpool_open_silent(libzfs_handle_t *, const char *, zpool_handle_t **);
 194  199  
 195  200  boolean_t zpool_name_valid(libzfs_handle_t *, boolean_t, const char *);
 196  201  
↓ open down ↓ 6 lines elided ↑ open up ↑
 203  208   * libshare (sharemgr) interfaces used internally.
 204  209   */
 205  210  
 206  211  extern int zfs_init_libshare(libzfs_handle_t *, int);
 207  212  extern int zfs_parse_options(char *, zfs_share_proto_t);
 208  213  
 209  214  extern int zfs_unshare_proto(zfs_handle_t *,
 210  215      const char *, zfs_share_proto_t *);
 211  216  
 212  217  extern void libzfs_fru_clear(libzfs_handle_t *, boolean_t);
      218 +extern void libzfs_log_event(libzfs_handle_t *, const char *name);
 213  219  
 214  220  #ifdef  __cplusplus
 215  221  }
 216  222  #endif
 217  223  
 218  224  #endif  /* _LIBZFS_IMPL_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX