diff options
| author | Matthew Ahrens <[email protected]> | 2015-11-04 21:19:17 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-01-12 09:10:52 -0800 |
| commit | 5511754b4fa6b105941ec4e19a3b1c2b34bb7452 (patch) | |
| tree | b13af05344f486cabb40ec5126cbfc1bf790582b | |
| parent | 7f60329a261bd48558a498fb10e9b29638eab33b (diff) | |
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 <[email protected]>
Approved by: Dan McDonald <[email protected]>
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 [email protected]
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3449
| -rw-r--r-- | TEST | 2 | ||||
| -rw-r--r-- | module/zfs/zio.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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) { |