Author: mav
Date: Tue Jan 26 12:33:58 2016
New Revision: 294797
URL: https://svnweb.freebsd.org/changeset/base/294797
Log:
MFV r294796: 6319 assertion failed in zio_ddt_write: bp->blk_birth == txg
Reviewed by: George Wilson <george.wil...@delphix.com>
Approved by: Dan McDonald <dan...@omniti.com>
illumos/illumos-gate@b39b744be78c6327db43c1f69d11c2f5909f73cb
This is revert of 5693.
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Tue Jan 26
12:32:46 2016 (r294796)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Tue Jan 26
12:33:58 2016 (r294797)
@@ -1217,6 +1217,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) {
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
