diff options
| author | Brian Behlendorf <[email protected]> | 2009-07-09 12:23:41 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-07-09 12:23:41 -0700 |
| commit | c4c4afd8fdea6fad8595a6609d47f75e8083f71d (patch) | |
| tree | 9fae669a979cc5e98fb0f203f11d4808f4631660 /module/zfs/dmu_objset.c | |
| parent | e5e94c40f7acbff46e0141360e523a28a2f8330c (diff) | |
| parent | 6db8882b78334225baa44e755439f7542dd5ccd5 (diff) | |
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
Diffstat (limited to 'module/zfs/dmu_objset.c')
| -rw-r--r-- | module/zfs/dmu_objset.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index d1cd9d530..d6ad530fd 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -893,9 +893,9 @@ ready(zio_t *zio, arc_buf_t *abuf, void *arg) int i; blkptr_t *bp = zio->io_bp; - blkptr_t *bp_orig = &zio->io_bp_orig; objset_impl_t *os = arg; dnode_phys_t *dnp = &os->os_phys->os_meta_dnode; + ASSERTV(blkptr_t *bp_orig = &zio->io_bp_orig); ASSERT(bp == os->os_rootbp); ASSERT(BP_GET_TYPE(bp) == DMU_OT_OBJSET); @@ -912,7 +912,7 @@ ready(zio_t *zio, arc_buf_t *abuf, void *arg) bp->blk_fill += dnp->dn_blkptr[i].blk_fill; if (zio->io_flags & ZIO_FLAG_IO_REWRITE) { - VERIFY(DVA_EQUAL(BP_IDENTITY(bp), BP_IDENTITY(bp_orig))); + ASSERT(DVA_EQUAL(BP_IDENTITY(bp), BP_IDENTITY(bp_orig))); } else { if (zio->io_bp_orig.blk_birth == os->os_synctx->tx_txg) (void) dsl_dataset_block_kill(os->os_dsl_dataset, @@ -1040,7 +1040,7 @@ dmu_objset_do_userquota_callbacks(objset_impl_t *os, dmu_tx_t *tx) { dnode_t *dn; list_t *list = &os->os_synced_dnodes; - static const char zerobuf[DN_MAX_BONUSLEN] = {0}; + ASSERTV(static const char zerobuf[DN_MAX_BONUSLEN] = {0}); ASSERT(list_head(list) == NULL || dmu_objset_userused_enabled(os)); |