Print this page
6160 /usr/lib/fs/zfs/bootinstall should use bootadm
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Adam Števko <adam.stevko@gmail.com>
Reviewed by: Josef Sipek <jeffpc@josefsipek.net>
Approved by: Richard Lowe <richlowe@richlowe.net>
4185 add new cryptographic checksums to ZFS: SHA-512, Skein, Edon-R (NULL is not an int)
6171 dsl_prop_unregister() slows down dataset eviction.
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Prakash Surya <prakash.surya@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/zfs/sys/dsl_dir.h
          +++ new/usr/src/uts/common/fs/zfs/sys/dsl_dir.h
↓ open down ↓ 39 lines elided ↑ open up ↑
  40   40  
  41   41  struct dsl_dataset;
  42   42  
  43   43  /*
  44   44   * DD_FIELD_* are strings that are used in the "extensified" dsl_dir zap object.
  45   45   * They should be of the format <reverse-dns>:<field>.
  46   46   */
  47   47  
  48   48  #define DD_FIELD_FILESYSTEM_COUNT       "com.joyent:filesystem_count"
  49   49  #define DD_FIELD_SNAPSHOT_COUNT         "com.joyent:snapshot_count"
  50      -#define DD_FIELD_LAST_REMAP_TXG         "com.delphix:last_remap_txg"
  51   50  
  52   51  typedef enum dd_used {
  53   52          DD_USED_HEAD,
  54   53          DD_USED_SNAP,
  55   54          DD_USED_CHILD,
  56   55          DD_USED_CHILD_RSRV,
  57   56          DD_USED_REFRSRV,
  58   57          DD_USED_NUM
  59   58  } dd_used_t;
  60   59  
↓ open down ↓ 77 lines elided ↑ open up ↑
 138  137  uint64_t dsl_dir_get_reservation(dsl_dir_t *dd);
 139  138  uint64_t dsl_dir_get_compressratio(dsl_dir_t *dd);
 140  139  uint64_t dsl_dir_get_logicalused(dsl_dir_t *dd);
 141  140  uint64_t dsl_dir_get_usedsnap(dsl_dir_t *dd);
 142  141  uint64_t dsl_dir_get_usedds(dsl_dir_t *dd);
 143  142  uint64_t dsl_dir_get_usedrefreserv(dsl_dir_t *dd);
 144  143  uint64_t dsl_dir_get_usedchild(dsl_dir_t *dd);
 145  144  void dsl_dir_get_origin(dsl_dir_t *dd, char *buf);
 146  145  int dsl_dir_get_filesystem_count(dsl_dir_t *dd, uint64_t *count);
 147  146  int dsl_dir_get_snapshot_count(dsl_dir_t *dd, uint64_t *count);
 148      -int dsl_dir_get_remaptxg(dsl_dir_t *dd, uint64_t *count);
 149  147  
 150  148  void dsl_dir_stats(dsl_dir_t *dd, nvlist_t *nv);
 151  149  uint64_t dsl_dir_space_available(dsl_dir_t *dd,
 152  150      dsl_dir_t *ancestor, int64_t delta, int ondiskonly);
 153  151  void dsl_dir_dirty(dsl_dir_t *dd, dmu_tx_t *tx);
 154  152  void dsl_dir_sync(dsl_dir_t *dd, dmu_tx_t *tx);
 155  153  int dsl_dir_tempreserve_space(dsl_dir_t *dd, uint64_t mem,
 156  154      uint64_t asize, boolean_t netfree, void **tr_cookiep, dmu_tx_t *tx);
 157  155  void dsl_dir_tempreserve_clear(void *tr_cookie, dmu_tx_t *tx);
 158  156  void dsl_dir_willuse_space(dsl_dir_t *dd, int64_t space, dmu_tx_t *tx);
↓ open down ↓ 2 lines elided ↑ open up ↑
 161  159  void dsl_dir_transfer_space(dsl_dir_t *dd, int64_t delta,
 162  160      dd_used_t oldtype, dd_used_t newtype, dmu_tx_t *tx);
 163  161  int dsl_dir_set_quota(const char *ddname, zprop_source_t source,
 164  162      uint64_t quota);
 165  163  int dsl_dir_set_reservation(const char *ddname, zprop_source_t source,
 166  164      uint64_t reservation);
 167  165  int dsl_dir_activate_fs_ss_limit(const char *);
 168  166  int dsl_fs_ss_limit_check(dsl_dir_t *, uint64_t, zfs_prop_t, dsl_dir_t *,
 169  167      cred_t *);
 170  168  void dsl_fs_ss_count_adjust(dsl_dir_t *, int64_t, const char *, dmu_tx_t *);
 171      -int dsl_dir_update_last_remap_txg(dsl_dir_t *, uint64_t);
 172  169  int dsl_dir_rename(const char *oldname, const char *newname);
 173  170  int dsl_dir_transfer_possible(dsl_dir_t *sdd, dsl_dir_t *tdd,
 174  171      uint64_t fs_cnt, uint64_t ss_cnt, uint64_t space, cred_t *);
 175  172  boolean_t dsl_dir_is_clone(dsl_dir_t *dd);
 176  173  void dsl_dir_new_refreservation(dsl_dir_t *dd, struct dsl_dataset *ds,
 177  174      uint64_t reservation, cred_t *cr, dmu_tx_t *tx);
 178  175  void dsl_dir_snap_cmtime_update(dsl_dir_t *dd);
 179  176  timestruc_t dsl_dir_snap_cmtime(dsl_dir_t *dd);
 180  177  void dsl_dir_set_reservation_sync_impl(dsl_dir_t *dd, uint64_t value,
 181  178      dmu_tx_t *tx);
 182  179  void dsl_dir_zapify(dsl_dir_t *dd, dmu_tx_t *tx);
 183  180  boolean_t dsl_dir_is_zapified(dsl_dir_t *dd);
 184  181  
 185  182  /* internal reserved dir name */
 186  183  #define MOS_DIR_NAME "$MOS"
 187  184  #define ORIGIN_DIR_NAME "$ORIGIN"
      185 +#define XLATION_DIR_NAME "$XLATION"
 188  186  #define FREE_DIR_NAME "$FREE"
 189  187  #define LEAK_DIR_NAME "$LEAK"
 190  188  
 191  189  #ifdef ZFS_DEBUG
 192  190  #define dprintf_dd(dd, fmt, ...) do { \
 193  191          if (zfs_flags & ZFS_DEBUG_DPRINTF) { \
 194  192          char *__ds_name = kmem_alloc(ZFS_MAX_DATASET_NAME_LEN, KM_SLEEP); \
 195  193          dsl_dir_name(dd, __ds_name); \
 196  194          dprintf("dd=%s " fmt, __ds_name, __VA_ARGS__); \
 197  195          kmem_free(__ds_name, ZFS_MAX_DATASET_NAME_LEN); \
↓ open down ↓ 11 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX