Print this page
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>
        
*** 200,210 ****
  
          /*
           * For DTrace to work in userland (libzpool) context, these fields must
           * remain at the end of the structure.  DTrace will use the kernel's
           * CTF definition for 'struct vdev', and since the size of a kmutex_t is
!          * larger in userland, the offsets for the rest fields would be
           * incorrect.
           */
          kmutex_t        vdev_dtl_lock;  /* vdev_dtl_{map,resilver}      */
          kmutex_t        vdev_stat_lock; /* vdev_stat                    */
          kmutex_t        vdev_probe_lock; /* protects vdev_probe_zio     */
--- 200,210 ----
  
          /*
           * For DTrace to work in userland (libzpool) context, these fields must
           * remain at the end of the structure.  DTrace will use the kernel's
           * CTF definition for 'struct vdev', and since the size of a kmutex_t is
!          * larger in userland, the offsets for the rest of the fields would be
           * incorrect.
           */
          kmutex_t        vdev_dtl_lock;  /* vdev_dtl_{map,resilver}      */
          kmutex_t        vdev_stat_lock; /* vdev_stat                    */
          kmutex_t        vdev_probe_lock; /* protects vdev_probe_zio     */
*** 255,264 ****
--- 255,265 ----
   * Size of label regions at the start and end of each leaf device.
   */
  #define VDEV_LABEL_START_SIZE   (2 * sizeof (vdev_label_t) + VDEV_BOOT_SIZE)
  #define VDEV_LABEL_END_SIZE     (2 * sizeof (vdev_label_t))
  #define VDEV_LABELS             4
+ #define VDEV_BEST_LABEL         VDEV_LABELS
  
  #define VDEV_ALLOC_LOAD         0
  #define VDEV_ALLOC_ADD          1
  #define VDEV_ALLOC_SPARE        2
  #define VDEV_ALLOC_L2CACHE      3