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,30 ****
   *
   * CDDL HEADER END
   */
  /*
   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
-  */
- /*
   * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
   */
  
  #include <sys/dmu.h>
  #include <sys/dmu_impl.h>
  #include <sys/dbuf.h>
--- 18,29 ----
   *
   * CDDL HEADER END
   */
  /*
   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
   * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+  * Copyright (c) 2012 by Delphix. All rights reserved.
   */
  
  #include <sys/dmu.h>
  #include <sys/dmu_impl.h>
  #include <sys/dbuf.h>
*** 674,684 ****
                   */
                  dmu_tx_count_write(txh, 0, 2 << fzap_default_block_shift);
                  return;
          }
  
!         ASSERT3P(dmu_ot[dn->dn_type].ot_byteswap, ==, zap_byteswap);
  
          if (dn->dn_maxblkid == 0 && !add) {
                  blkptr_t *bp;
  
                  /*
--- 673,683 ----
                   */
                  dmu_tx_count_write(txh, 0, 2 << fzap_default_block_shift);
                  return;
          }
  
!         ASSERT3P(DMU_OT_BYTESWAP(dn->dn_type), ==, DMU_BSWAP_ZAP);
  
          if (dn->dn_maxblkid == 0 && !add) {
                  blkptr_t *bp;
  
                  /*