Author: mav
Date: Sat Oct  3 07:24:12 2015
New Revision: 288543
URL: https://svnweb.freebsd.org/changeset/base/288543

Log:
  MFC r286549:
  5693 ztest fails in dbuf_verify: buf[i] == 0, due to dedup and bp_override
  
  Reviewed by: George Wilson <geo...@delphix.com>
  Reviewed by: Christopher Siden <christopher.si...@delphix.com>
  Reviewed by: Bayard Bell <buffer.g.overf...@gmail.com>
  Approved by: Dan McDonald <dan...@omniti.com>
  Author: Matthew Ahrens <mahr...@delphix.com>
  
  illumos/illumos-gate@7f7ace370074e350853da254c65688fd43ddc695

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c      Sat Oct 
 3 07:23:19 2015        (r288542)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c      Sat Oct 
 3 07:24:12 2015        (r288543)
@@ -1216,8 +1216,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) {
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to