Undo c89 workarounds to match with upstream

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

diff --git a/module/zfs/zap_micro.c b/module/zfs/zap_micro.c
index 3ebf995c6780cea7fc260a1c3dde9c04e024166b..b81a48a0f63d0844fabb9c13997aeed43d22d217 100644 (file)
--- a/module/zfs/zap_micro.c
+++ b/module/zfs/zap_micro.c
@@ -541,11 +541,10 @@ zap_lockdir_impl(dmu_buf_t *db, void *tag, dmu_tx_t *tx,
            zap->zap_m.zap_num_entries == zap->zap_m.zap_num_chunks) {
                uint64_t newsz = db->db_size + SPA_MINBLOCKSIZE;
                if (newsz > MZAP_MAX_BLKSZ) {
-                       int err;
                        dprintf("upgrading obj %llu: num_entries=%u\n",
                            obj, zap->zap_m.zap_num_entries);
                        *zapp = zap;
-                       err = mzap_upgrade(zapp, tag, tx, 0);
+                       int err = mzap_upgrade(zapp, tag, tx, 0);
                        if (err != 0)
                                rw_exit(&zap->zap_rwlock);
                        return (err);