From d68ac65eb61acfd898262709a726bbcd7f5a31f1 Mon Sep 17 00:00:00 2001 From: megari Date: Mon, 16 Apr 2018 22:44:40 +0300 Subject: [PATCH] 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 Reviewed-by: Tim Chase Signed-off-by: Ari Sundholm Closes #7444 --- module/zfs/vdev_indirect_mapping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/zfs/vdev_indirect_mapping.c b/module/zfs/vdev_indirect_mapping.c index beb5ea4d68..dbd6a7635b 100644 --- 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);