Illumos 4757, 4913

[mirror_zfs.git] / module / zfs / zil.c

diff --git a/module/zfs/zil.c b/module/zfs/zil.c
index b5ee395d1f63cc5931d58517b9a310dfda8a18b2..7c3c6592b51f59a007546271356b9242a0058f47 100644 (file)
--- a/module/zfs/zil.c
+++ b/module/zfs/zil.c
@@ -159,10 +159,15 @@ int
 zil_bp_tree_add(zilog_t *zilog, const blkptr_t *bp)
 {
        avl_tree_t *t = &zilog->zl_bp_tree;
-       const dva_t *dva = BP_IDENTITY(bp);
+       const dva_t *dva;
        zil_bp_node_t *zn;
        avl_index_t where;
 
+       if (BP_IS_EMBEDDED(bp))
+               return (0);
+
+       dva = BP_IDENTITY(bp);
+
        if (avl_find(t, dva, &where) != NULL)
                return (SET_ERROR(EEXIST));
 
@@ -863,7 +868,7 @@ zil_lwb_write_done(zio_t *zio)
        ASSERT(BP_GET_BYTEORDER(zio->io_bp) == ZFS_HOST_BYTEORDER);
        ASSERT(!BP_IS_GANG(zio->io_bp));
        ASSERT(!BP_IS_HOLE(zio->io_bp));
-       ASSERT(zio->io_bp->blk_fill == 0);
+       ASSERT(BP_GET_FILL(zio->io_bp) == 0);
 
        /*
         * Ensure the lwb buffer pointer is cleared before releasing