diff options
| author | Brian Behlendorf <[email protected]> | 2009-01-15 13:59:39 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-01-15 13:59:39 -0800 |
| commit | fb5f0bc83330c8a0236c4d34a23723ac1974971a (patch) | |
| tree | 51880dcfa8ec9e8e80b8c44e9ffc55a4b7160216 /module/zfs/vdev_raidz.c | |
| parent | 42bcb36c8987b0b11411ce6cf8339694b624a17c (diff) | |
Rebase master to b105
Diffstat (limited to 'module/zfs/vdev_raidz.c')
| -rw-r--r-- | module/zfs/vdev_raidz.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/module/zfs/vdev_raidz.c b/module/zfs/vdev_raidz.c index 69e314468..ad997f528 100644 --- a/module/zfs/vdev_raidz.c +++ b/module/zfs/vdev_raidz.c @@ -687,7 +687,7 @@ vdev_raidz_io_start(zio_t *zio) rc->rc_skipped = 1; continue; } - if (vdev_dtl_contains(&cvd->vdev_dtl_map, bp->blk_birth, 1)) { + if (vdev_dtl_contains(cvd, DTL_MISSING, bp->blk_birth, 1)) { if (c >= rm->rm_firstdatacol) rm->rm_missingdata++; else @@ -1165,7 +1165,7 @@ vdev_raidz_io_done(zio_t *zio) done: zio_checksum_verified(zio); - if (zio->io_error == 0 && (spa_mode & FWRITE) && + if (zio->io_error == 0 && spa_writeable(zio->io_spa) && (unexpected_errors || (zio->io_flags & ZIO_FLAG_RESILVER))) { /* * Use the good data we have in hand to repair damaged children. @@ -1180,7 +1180,8 @@ done: zio_nowait(zio_vdev_child_io(zio, NULL, cvd, rc->rc_offset, rc->rc_data, rc->rc_size, ZIO_TYPE_WRITE, zio->io_priority, - ZIO_FLAG_IO_REPAIR, NULL, NULL)); + ZIO_FLAG_IO_REPAIR | (unexpected_errors ? + ZIO_FLAG_SELF_HEAL : 0), NULL, NULL)); } } } |