Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl

This commit is contained in:
Brian Behlendorf 2009-03-11 22:50:29 -07:00
commit 7dda95296c
1 changed files with 1 additions and 2 deletions

View File

@ -1432,10 +1432,9 @@ zio_gang_tree_assemble_done(zio_t *zio)
zio_t *lio = zio->io_logical;
zio_gang_node_t *gn = zio->io_private;
blkptr_t *bp = zio->io_bp;
zio_t *pio = zio_unique_parent(zio);
int g;
ASSERT(pio == lio);
ASSERT(zio_unique_parent(zio) == lio);
ASSERT(zio_walk_children(zio) == NULL);
if (zio->io_error)