Undo c89 workarounds to match with upstream

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

diff --git a/module/zfs/blkptr.c b/module/zfs/blkptr.c
index b7529f6356b5bf7297393c4fcf61ac2bf2975804..ee24b1c312da8163872ee3e7b2ff72073b25c0b8 100644 (file)
--- a/module/zfs/blkptr.c
+++ b/module/zfs/blkptr.c
@@ -50,7 +50,6 @@ encode_embedded_bp_compressed(blkptr_t *bp, void *data,
        uint64_t *bp64 = (uint64_t *)bp;
        uint64_t w = 0;
        uint8_t *data8 = data;
-       int i;
 
        ASSERT3U(compressed_size, <=, BPE_PAYLOAD_SIZE);
        ASSERT(uncompressed_size == compressed_size ||
@@ -69,7 +68,7 @@ encode_embedded_bp_compressed(blkptr_t *bp, void *data,
         * Encode the byte array into the words of the block pointer.
         * First byte goes into low bits of first word (little endian).
         */
-       for (i = 0; i < compressed_size; i++) {
+       for (int i = 0; i < compressed_size; i++) {
                BF64_SET(w, (i % sizeof (w)) * NBBY, NBBY, data8[i]);
                if (i % sizeof (w) == sizeof (w) - 1) {
                        /* we've reached the end of a word */
@@ -97,7 +96,6 @@ decode_embedded_bp_compressed(const blkptr_t *bp, void *buf)
        uint8_t *buf8 = buf;
        uint64_t w = 0;
        const uint64_t *bp64 = (const uint64_t *)bp;
-       int i;
 
        ASSERT(BP_IS_EMBEDDED(bp));
 
@@ -107,7 +105,7 @@ decode_embedded_bp_compressed(const blkptr_t *bp, void *buf)
         * Decode the words of the block pointer into the byte array.
         * Low bits of first word are the first byte (little endian).
         */
-       for (i = 0; i < psize; i++) {
+       for (int i = 0; i < psize; i++) {
                if (i % sizeof (w) == 0) {
                        /* beginning of a word */
                        ASSERT3P(bp64, <, bp + 1);