Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-01-09 14:17:52 -08:00
commit 1e181bcb77
1 changed files with 1 additions and 1 deletions

View File

@ -852,8 +852,8 @@ zio_write_bp_init(zio_t *zio)
*/ */
if (bp->blk_birth == zio->io_txg && BP_GET_PSIZE(bp) == csize && if (bp->blk_birth == zio->io_txg && BP_GET_PSIZE(bp) == csize &&
pass > SYNC_PASS_REWRITE) { pass > SYNC_PASS_REWRITE) {
ASSERT(csize != 0);
uint32_t gang_stages = zio->io_pipeline & ZIO_GANG_STAGES; uint32_t gang_stages = zio->io_pipeline & ZIO_GANG_STAGES;
ASSERT(csize != 0);
zio->io_pipeline = ZIO_REWRITE_PIPELINE | gang_stages; zio->io_pipeline = ZIO_REWRITE_PIPELINE | gang_stages;
zio->io_flags |= ZIO_FLAG_IO_REWRITE; zio->io_flags |= ZIO_FLAG_IO_REWRITE;
} else { } else {