summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2010-06-12 11:20:50 +0000
committermm <mm@FreeBSD.org>2010-06-12 11:20:50 +0000
commit53bcf2affc9a01110706023cbacc60b1cf13bbb2 (patch)
tree228c2f5b09002dc0ba11fefed9c9bcda72006bb3
parentd97ee7139a7df5b95118dcf5cf43a08a3ef8c0fe (diff)
downloadFreeBSD-src-53bcf2affc9a01110706023cbacc60b1cf13bbb2.zip
FreeBSD-src-53bcf2affc9a01110706023cbacc60b1cf13bbb2.tar.gz
Fix incomplete resilvering after disk replacement (raidz)
OpenSolaris onnv-revision: 9434:3bebded7c76a Obtained from: OpenSolaris (Bug ID 6794570) Approved by: pjd, delphij (mentor) MFC after: 3 days
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
index 69e3144..0a06190 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -697,7 +697,7 @@ vdev_raidz_io_start(zio_t *zio)
continue;
}
if (c >= rm->rm_firstdatacol || rm->rm_missingdata > 0 ||
- (zio->io_flags & ZIO_FLAG_SCRUB)) {
+ (zio->io_flags & (ZIO_FLAG_SCRUB | ZIO_FLAG_RESILVER))) {
zio_nowait(zio_vdev_child_io(zio, NULL, cvd,
rc->rc_offset, rc->rc_data, rc->rc_size,
zio->io_type, zio->io_priority, 0,
OpenPOWER on IntegriCloud