Page MenuHomeFreeBSD
Files F171458084

D13278.id36004.diff
No OneTemporary
Actions

D13278.id36004.diff
View Options

Index: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
===================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
@@ -2398,7 +2398,7 @@
*/
if (parity_errors + parity_untried <
rm->rm_firstdatacol ||
- (zio->io_flags & ZIO_FLAG_RESILVER)) {
+ (zio->io_flags & (ZIO_FLAG_RESILVER | ZIO_FLAG_SCRUB))) {
n = raidz_parity_verify(zio, rm);
unexpected_errors += n;
ASSERT(parity_errors + n <=
@@ -2450,7 +2450,7 @@
* out to failed devices later.
*/
if (parity_errors < rm->rm_firstdatacol - n ||
- (zio->io_flags & ZIO_FLAG_RESILVER)) {
+ (zio->io_flags & (ZIO_FLAG_RESILVER | ZIO_FLAG_SCRUB))) {
n = raidz_parity_verify(zio, rm);
unexpected_errors += n;
ASSERT(parity_errors + n <=
@@ -2552,7 +2552,8 @@
zio_checksum_verified(zio);
if (zio->io_error == 0 && spa_writeable(zio->io_spa) &&
- (unexpected_errors || (zio->io_flags & ZIO_FLAG_RESILVER))) {
+ (unexpected_errors ||
+ (zio->io_flags & (ZIO_FLAG_RESILVER | ZIO_FLAG_SCRUB)))) {
/*
* Use the good data we have in hand to repair damaged children.
*/

File Metadata

Mime Type
text/plain
Expires
Sat, Sep 12, 5:32 AM (4 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38770405
Default Alt Text
D13278.id36004.diff (1 KB)

Event Timeline