diff options
| author | Don Brady <[email protected]> | 2017-11-04 14:25:13 -0600 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-11-04 13:25:13 -0700 |
| commit | 1c27024e22af4386b592b30d40e6a0820ceb48c1 (patch) | |
| tree | 689d4b821fd6910a137a0f93351351def5011cec /module/zfs/bpobj.c | |
| parent | df1f129bc4150fd6ea3f23a01154a71ffa48bf12 (diff) | |
Undo c89 workarounds to match with upstream
With PR 5756 the zfs module now supports c99 and the
remaining past c89 workarounds can be undone.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Don Brady <[email protected]>
Closes #6816
Diffstat (limited to 'module/zfs/bpobj.c')
| -rw-r--r-- | module/zfs/bpobj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/bpobj.c b/module/zfs/bpobj.c index 32459c9a8..1708eb710 100644 --- a/module/zfs/bpobj.c +++ b/module/zfs/bpobj.c @@ -378,7 +378,6 @@ bpobj_enqueue_subobj(bpobj_t *bpo, uint64_t subobj, dmu_tx_t *tx) { bpobj_t subbpo; uint64_t used, comp, uncomp, subsubobjs; - ASSERTV(dmu_object_info_t doi); ASSERT(bpo->bpo_havesubobj); ASSERT(bpo->bpo_havecomp); @@ -407,6 +406,7 @@ bpobj_enqueue_subobj(bpobj_t *bpo, uint64_t subobj, dmu_tx_t *tx) DMU_OT_NONE, 0, tx); } + ASSERTV(dmu_object_info_t doi); ASSERT0(dmu_object_info(bpo->bpo_os, bpo->bpo_phys->bpo_subobjs, &doi)); ASSERT3U(doi.doi_type, ==, DMU_OT_BPOBJ_SUBOBJ); |