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,25 ****
--- 16,26 ----
   * 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.
   */
  
*** 139,150 ****
   * Label routines
   */
  struct uberblock;
  extern uint64_t vdev_label_offset(uint64_t psize, int l, uint64_t offset);
  extern int vdev_label_number(uint64_t psise, uint64_t offset);
! extern nvlist_t *vdev_label_read_config(vdev_t *vd);
! extern void vdev_uberblock_load(zio_t *zio, vdev_t *vd, struct uberblock *ub);
  
  typedef enum {
          VDEV_LABEL_CREATE,      /* create/add a new device */
          VDEV_LABEL_REPLACE,     /* replace an existing device */
          VDEV_LABEL_SPARE,       /* add a new hot spare */
--- 140,151 ----
   * Label routines
   */
  struct uberblock;
  extern uint64_t vdev_label_offset(uint64_t psize, int l, uint64_t offset);
  extern int vdev_label_number(uint64_t psise, uint64_t offset);
! extern nvlist_t *vdev_label_read_config(vdev_t *vd, int label);
! extern void vdev_uberblock_load(vdev_t *, struct uberblock *, nvlist_t **);
  
  typedef enum {
          VDEV_LABEL_CREATE,      /* create/add a new device */
          VDEV_LABEL_REPLACE,     /* replace an existing device */
          VDEV_LABEL_SPARE,       /* add a new hot spare */