Mercurial > illumos > illumos-gate

diff usr/src/uts/common/fs/zfs/spa.c @ 1807:35c8b566d7af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6410711 intent log blocks don't get invited to pool parties
author bonwick
date Thu, 13 Apr 2006 16:15:06 -0700
parents e51e26b432c0
children 628267397204
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/spa.c	Thu Apr 13 15:37:22 2006 -0700
+++ b/usr/src/uts/common/fs/zfs/spa.c	Thu Apr 13 16:15:06 2006 -0700
@@ -426,7 +426,7 @@
 	error = zap_lookup(spa->spa_meta_objset,
 	    DMU_POOL_DIRECTORY_OBJECT, DMU_POOL_ERRLOG_LAST,
 	    sizeof (uint64_t), 1, &spa->spa_errlog_last);
-	if (error != 0 &&error != ENOENT) {
+	if (error != 0 && error != ENOENT) {
 		vdev_set_state(rvd, B_TRUE, VDEV_STATE_CANT_OPEN,
 		    VDEV_AUX_CORRUPT_DATA);
 		error = EIO;
@@ -1530,7 +1530,7 @@
 	if (zb->zb_level == -1 && BP_GET_TYPE(bp) != DMU_OT_OBJSET)
 		flags |= ZIO_FLAG_SPECULATIVE;	/* intent log block */
 
-	flags |= ZIO_FLAG_CANFAIL;
+	flags |= ZIO_FLAG_SCRUB_THREAD | ZIO_FLAG_CANFAIL;
 
 	zio_nowait(zio_read(NULL, spa, bp, data, size,
 	    spa_scrub_io_done, NULL, priority, flags, zb));