From 34cf92ad3b7929a305950012bb95ff8b4d981213 Mon Sep 17 00:00:00 2001
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 26 Jan 2016 12:32:46 +0000
Subject: [PATCH] 6319 assertion failed in zio_ddt_write: bp->blk_birth == txg

Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>

illumos/illumos-gate@b39b744be78c6327db43c1f69d11c2f5909f73cb

This is revert of 5693.
---
 uts/common/fs/zfs/zio.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/uts/common/fs/zfs/zio.c b/uts/common/fs/zfs/zio.c
index e12924793600..4a3dafac9f7f 100644
--- a/uts/common/fs/zfs/zio.c
+++ b/uts/common/fs/zfs/zio.c
@@ -1133,6 +1133,8 @@ 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) {