2619 asynchronous destruction of ZFS file systems
2747 SPA versioning with zfs feature flags
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <gwilson@delphix.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>
Approved by: Dan McDonald <danmcd@nexenta.com>

*** 18,28 ****
   *
   * CDDL HEADER END
   */
  /*
   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2011 by Delphix. All rights reserved.
   */
  
  #include <sys/zio.h>
  #include <sys/spa.h>
  #include <sys/dmu.h>
--- 18,28 ----
   *
   * CDDL HEADER END
   */
  /*
   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2012 by Delphix. All rights reserved.
   */
  
  #include <sys/zio.h>
  #include <sys/spa.h>
  #include <sys/dmu.h>
*** 459,469 ****
  
  #ifdef ZFS_DEBUG
          {
                  dmu_object_info_t doi;
                  dmu_object_info_from_db(db, &doi);
!                 ASSERT(dmu_ot[doi.doi_type].ot_byteswap == zap_byteswap);
          }
  #endif
  
          zap = dmu_buf_get_user(db);
          if (zap == NULL)
--- 459,469 ----
  
  #ifdef ZFS_DEBUG
          {
                  dmu_object_info_t doi;
                  dmu_object_info_from_db(db, &doi);
!                 ASSERT3U(DMU_OT_BYTESWAP(doi.doi_type), ==, DMU_BSWAP_ZAP);
          }
  #endif
  
          zap = dmu_buf_get_user(db);
          if (zap == NULL)
*** 583,593 ****
  
  #ifdef ZFS_DEBUG
          {
                  dmu_object_info_t doi;
                  dmu_object_info_from_db(db, &doi);
!                 ASSERT(dmu_ot[doi.doi_type].ot_byteswap == zap_byteswap);
          }
  #endif
  
          dmu_buf_will_dirty(db, tx);
          zp = db->db_data;
--- 583,593 ----
  
  #ifdef ZFS_DEBUG
          {
                  dmu_object_info_t doi;
                  dmu_object_info_from_db(db, &doi);
!                 ASSERT3U(DMU_OT_BYTESWAP(doi.doi_type), ==, DMU_BSWAP_ZAP);
          }
  #endif
  
          dmu_buf_will_dirty(db, tx);
          zp = db->db_data;