diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2018-10-08 15:19:03 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2018-10-08 15:19:03 +0000 |
| commit | f3b515aea565140c93e77011516e9e3cbe7dc0d2 (patch) | |
| tree | 98cb34b9349b28a3b7d936d11261eeb63dd97d5f | |
| parent | 2df98d5eeca375254abb5c39deff921acea654c1 (diff) | |
| download | src-test2-f3b515aea565140c93e77011516e9e3cbe7dc0d2.tar.gz src-test2-f3b515aea565140c93e77011516e9e3cbe7dc0d2.zip | |
Fix r336951 mismerge -- use of uninitialized variable.
Reported by: tsoome
Approved by: re (gjb)
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=339237
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c index 542cfe7b465c..a32df14e7507 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c @@ -2964,6 +2964,8 @@ dsl_scan_need_resilver(spa_t *spa, const dva_t *dva, size_t psize, { vdev_t *vd; + vd = vdev_lookup_top(spa, DVA_GET_VDEV(dva)); + if (vd->vdev_ops == &vdev_indirect_ops) { /* * The indirect vdev can point to multiple @@ -2974,6 +2976,7 @@ dsl_scan_need_resilver(spa_t *spa, const dva_t *dva, size_t psize, */ return (B_TRUE); } + if (DVA_GET_GANG(dva)) { /* * Gang members may be spread across multiple @@ -2986,8 +2989,6 @@ dsl_scan_need_resilver(spa_t *spa, const dva_t *dva, size_t psize, return (B_TRUE); } - vd = vdev_lookup_top(spa, DVA_GET_VDEV(dva)); - /* * Check if the txg falls within the range which must be * resilvered. DVAs outside this range can always be skipped. |