From 0f7d2a4b3d2d7fc0975a7ef53bd3c4700d47c51b Mon Sep 17 00:00:00 2001
From: Matthew Ahrens <mahrens@delphix.com>
Date: Fri, 27 Mar 2015 17:11:50 +1100
Subject: [PATCH] Illumus 5693 - ztest fails in dbuf_verify: buf[i] == 0, due
 to dedup and bp_override

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
  https://github.com/illumos/illumos-gate/commit/7f7ace3

Ported-by: Chris Dunlop <chris@onthe.net.au>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3231
---
 module/zfs/zio.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index ad0064443..066f04f18 100644
--- 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) {