3956 ::vdev -r should work with pipelines
3957 ztest should update the cachefile before killing itself
3958 multiple scans can lead to partial resilvering
3959 ddt entries are not always resilvered
3960 dsl_scan can skip over dedup-ed blocks if physical birth != logical birth
3961 freed gang blocks are not resilvered and can cause pool to suspend
3962 ztest should print out zfs debug buffer before exiting
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Adam Leventhal <ahl@delphix.com>

@@ -18,11 +18,11 @@
  *
  * CDDL HEADER END
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_VDEV_IMPL_H
 #define _SYS_VDEV_IMPL_H
 

@@ -171,11 +171,11 @@
         uint64_t        vdev_wholedisk; /* true if this is a whole disk */
         uint64_t        vdev_offline;   /* persistent offline state     */
         uint64_t        vdev_faulted;   /* persistent faulted state     */
         uint64_t        vdev_degraded;  /* persistent degraded state    */
         uint64_t        vdev_removed;   /* persistent removed state     */
-        uint64_t        vdev_resilvering; /* persistent resilvering state */
+        uint64_t        vdev_resilver_txg; /* persistent resilvering state */
         uint64_t        vdev_nparity;   /* number of parity devices for raidz */
         char            *vdev_path;     /* vdev path (if any)           */
         char            *vdev_devid;    /* vdev devid (if any)          */
         char            *vdev_physpath; /* vdev device path (if any)    */
         char            *vdev_fru;      /* physical FRU location        */