From 7f7ace370074e350853da254c65688fd43ddc695 Mon Sep 17 00:00:00 2001
From: Matthew Ahrens <mahrens@delphix.com>
Date: Tue, 24 Mar 2015 08:49:03 -0800
Subject: [PATCH] 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>

---
 usr/src/uts/common/fs/zfs/zio.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/usr/src/uts/common/fs/zfs/zio.c b/usr/src/uts/common/fs/zfs/zio.c
index d0a42e9af13b..51aa558505bb 100644
--- a/usr/src/uts/common/fs/zfs/zio.c
+++ b/usr/src/uts/common/fs/zfs/zio.c
@@ -1128,8 +1128,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) {