Illumus 5693 - ztest fails in dbuf_verify: buf[i] == 0, due to dedup and bp_override

ahrens · behlendorf · commit 0f7d2a4b3d2d · 2015-03-27T15:02:56.000-07:00
5693 ztest fails in dbuf_verify: buf[i] == 0, due to dedup and bp_override Reviewed by: George Wilson <george@delphix.com> Reviewed by: Christopher Siden <christopher.siden@delphix.com> Reviewed by: Bayard Bell <buffer.g.overflow@gmail.com> Approved by: Dan McDonald <danmcd@omniti.com> References: https://www.illumos.org/issues/5693 illumos/illumos-gate@7f7ace3 Ported-by: Chris Dunlop <chris@onthe.net.au> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #3231
diff --git a/module/zfs/zio.c b/module/zfs/zio.c
@@ -1043,8 +1043,6 @@ zio_write_bp_init(zio_t *zio)
 			zio->io_pipeline |= ZIO_STAGE_DDT_WRITE;
 			return (ZIO_PIPELINE_CONTINUE);
 		}
-		zio->io_bp_override = NULL;
-		BP_ZERO(bp);
 	}
 
 	if (!BP_IS_HOLE(bp) && bp->blk_birth == zio->io_txg) {

Original file line number	Diff line number	Diff line change
`@@ -1043,8 +1043,6 @@ zio_write_bp_init(zio_t *zio)`
`1043`	`1043`	`zio->io_pipeline \|= ZIO_STAGE_DDT_WRITE;`
`1044`	`1044`	`return (ZIO_PIPELINE_CONTINUE);`
`1045`	`1045`	`}`
`1046`		`- zio->io_bp_override = NULL;`
`1047`		`- BP_ZERO(bp);`
`1048`	`1046`	`}`
`1049`	`1047`
`1050`	`1048`	`if (!BP_IS_HOLE(bp) && bp->blk_birth == zio->io_txg) {`