From 5511754b4fa6b105941ec4e19a3b1c2b34bb7452 Mon Sep 17 00:00:00 2001 From: Matthew Ahrens Date: Wed, 4 Nov 2015 21:19:17 +0100 Subject: [PATCH] Illumos 6319 - assertion failed in zio_ddt_write: bp->blk_birth == txg 6319 assertion failed in zio_ddt_write: bp->blk_birth == txg Reviewed by: George Wilson Approved by: Dan McDonald References: https://www.illumos.org/issues/6319 https://github.com/illumos/illumos-gate/commit/b39b744 Porting notes: - Re-enabled ztest for CentOS test slaves. Ported-by: kernelOfTruth kerneloftruth@gmail.com Signed-off-by: Brian Behlendorf Closes #3449 --- TEST | 2 -- module/zfs/zio.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TEST b/TEST index eba35a37d..dd599d119 100644 --- a/TEST +++ b/TEST @@ -71,8 +71,6 @@ case "$BB_NAME" in Amazon*) ;; CentOS*) - # Sporadic segmentation faults - TEST_ZTEST_SKIP="yes" # Sporadic VERIFY(!zilog_is_dirty(zilog)) failed TEST_ZILTEST_SKIP="yes" ;; diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 3271f8207..9da7916e5 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -1164,6 +1164,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) {