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>

*** 16,27 ****
--- 16,29 ----
   * fields enclosed by brackets "[]" replaced with your own identifying
   * information: Portions Copyright [yyyy] [name of copyright owner]
   *
   * 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/zfs_context.h>
  #include <sys/dbuf.h>
  #include <sys/dnode.h>
*** 592,602 ****
                  ASSERT(dnp->dn_bonuslen <= DN_MAX_BONUSLEN);
                  dn->dn_next_bonuslen[txgoff] = 0;
          }
  
          if (dn->dn_next_bonustype[txgoff]) {
!                 ASSERT(dn->dn_next_bonustype[txgoff] < DMU_OT_NUMTYPES);
                  dnp->dn_bonustype = dn->dn_next_bonustype[txgoff];
                  dn->dn_next_bonustype[txgoff] = 0;
          }
  
          /*
--- 594,604 ----
                  ASSERT(dnp->dn_bonuslen <= DN_MAX_BONUSLEN);
                  dn->dn_next_bonuslen[txgoff] = 0;
          }
  
          if (dn->dn_next_bonustype[txgoff]) {
!                 ASSERT(DMU_OT_IS_VALID(dn->dn_next_bonustype[txgoff]));
                  dnp->dn_bonustype = dn->dn_next_bonustype[txgoff];
                  dn->dn_next_bonustype[txgoff] = 0;
          }
  
          /*