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>

@@ -45,11 +45,10 @@
  * They should be of the format <reverse-dns>:<field>.
  */
 
 #define DD_FIELD_FILESYSTEM_COUNT       "com.joyent:filesystem_count"
 #define DD_FIELD_SNAPSHOT_COUNT         "com.joyent:snapshot_count"
-#define DD_FIELD_LAST_REMAP_TXG         "com.delphix:last_remap_txg"
 
 typedef enum dd_used {
         DD_USED_HEAD,
         DD_USED_SNAP,
         DD_USED_CHILD,

@@ -143,11 +142,10 @@
 uint64_t dsl_dir_get_usedrefreserv(dsl_dir_t *dd);
 uint64_t dsl_dir_get_usedchild(dsl_dir_t *dd);
 void dsl_dir_get_origin(dsl_dir_t *dd, char *buf);
 int dsl_dir_get_filesystem_count(dsl_dir_t *dd, uint64_t *count);
 int dsl_dir_get_snapshot_count(dsl_dir_t *dd, uint64_t *count);
-int dsl_dir_get_remaptxg(dsl_dir_t *dd, uint64_t *count);
 
 void dsl_dir_stats(dsl_dir_t *dd, nvlist_t *nv);
 uint64_t dsl_dir_space_available(dsl_dir_t *dd,
     dsl_dir_t *ancestor, int64_t delta, int ondiskonly);
 void dsl_dir_dirty(dsl_dir_t *dd, dmu_tx_t *tx);

@@ -166,11 +164,10 @@
     uint64_t reservation);
 int dsl_dir_activate_fs_ss_limit(const char *);
 int dsl_fs_ss_limit_check(dsl_dir_t *, uint64_t, zfs_prop_t, dsl_dir_t *,
     cred_t *);
 void dsl_fs_ss_count_adjust(dsl_dir_t *, int64_t, const char *, dmu_tx_t *);
-int dsl_dir_update_last_remap_txg(dsl_dir_t *, uint64_t);
 int dsl_dir_rename(const char *oldname, const char *newname);
 int dsl_dir_transfer_possible(dsl_dir_t *sdd, dsl_dir_t *tdd,
     uint64_t fs_cnt, uint64_t ss_cnt, uint64_t space, cred_t *);
 boolean_t dsl_dir_is_clone(dsl_dir_t *dd);
 void dsl_dir_new_refreservation(dsl_dir_t *dd, struct dsl_dataset *ds,

@@ -183,10 +180,11 @@
 boolean_t dsl_dir_is_zapified(dsl_dir_t *dd);
 
 /* internal reserved dir name */
 #define MOS_DIR_NAME "$MOS"
 #define ORIGIN_DIR_NAME "$ORIGIN"
+#define XLATION_DIR_NAME "$XLATION"
 #define FREE_DIR_NAME "$FREE"
 #define LEAK_DIR_NAME "$LEAK"
 
 #ifdef ZFS_DEBUG
 #define dprintf_dd(dd, fmt, ...) do { \