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>

*** 20,30 ****
   */
  
  /*
   * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
   * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
!  * Copyright (c) 2011 by Delphix. All rights reserved.
   */
  
  #include <sys/spa.h>
  #include <sys/spa_impl.h>
  #include <sys/nvpair.h>
--- 20,30 ----
   */
  
  /*
   * 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/spa.h>
  #include <sys/spa_impl.h>
  #include <sys/nvpair.h>
*** 33,42 ****
--- 33,43 ----
  #include <sys/vdev_impl.h>
  #include <sys/zfs_ioctl.h>
  #include <sys/utsname.h>
  #include <sys/systeminfo.h>
  #include <sys/sunddi.h>
+ #include <sys/zfeature.h>
  #ifdef _KERNEL
  #include <sys/kobj.h>
  #include <sys/zone.h>
  #endif
  
*** 407,416 ****
--- 408,423 ----
  
          nvroot = vdev_config_generate(spa, vd, getstats, 0);
          VERIFY(nvlist_add_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, nvroot) == 0);
          nvlist_free(nvroot);
  
+         /*
+          * Store what's necessary for reading the MOS in the label.
+          */
+         VERIFY(nvlist_add_nvlist(config, ZPOOL_CONFIG_FEATURES_FOR_READ,
+             spa->spa_label_features) == 0);
+ 
          if (getstats && spa_load_state(spa) == SPA_LOAD_NONE) {
                  ddt_histogram_t *ddh;
                  ddt_stat_t *dds;
                  ddt_object_t *ddo;