Revert "OpenZFS 9036 - zfs: duplicate 'const' declaration specifier"

This reverts commit cbb893321545c2c9052787b556c9375fcb103979.

The original change in OpenZFS 9036 did remove duplicate 'const'
specifiers, but the ZoL port had already done what *should* have been
done in OpenZFS 9036, which is to make the pointers themselves const.
The port of the change to ZoL ended up doing an unnecessary removal
of the constness of the pointers. Undo that.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Ari Sundholm <ari@tuxera.com>
Closes #7444

diff --git a/module/zfs/vdev_indirect_mapping.c b/module/zfs/vdev_indirect_mapping.c
index beb5ea4d68e048229ace70632e4f2492f5458c4e..dbd6a7635b498426078c99319fd145fc6c7ccc81 100644 (file)
--- a/module/zfs/vdev_indirect_mapping.c
+++ b/module/zfs/vdev_indirect_mapping.c
@@ -136,8 +136,8 @@ vdev_indirect_mapping_size(vdev_indirect_mapping_t *vim)
 static int
 dva_mapping_overlap_compare(const void *v_key, const void *v_array_elem)
 {
-       const uint64_t *key = v_key;
-       const vdev_indirect_mapping_entry_phys_t *array_elem =
+       const uint64_t * const key = v_key;
+       const vdev_indirect_mapping_entry_phys_t * const array_elem =
            v_array_elem;
        uint64_t src_offset = DVA_MAPPING_GET_SRC_OFFSET(array_elem);