Don't call sizeof on void

We get the sizeof the appropriate type, and don't cast away const.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Matt Macy <mmacy@FreeBSD.org>
Signed-off-by: Paul Dagnelie <pcd@delphix.com>
Closes #9455

diff --git a/include/sys/range_tree.h b/include/sys/range_tree.h
index d80faa933e307f70250496656f85c8b96fe1aefb..6e0025a2f14771b57b6ab5f6d0d6dce6272b6a1d 100644 (file)
--- a/include/sys/range_tree.h
+++ b/include/sys/range_tree.h
@@ -126,11 +126,11 @@ rs_get_start_raw(const range_seg_t *rs, const range_tree_t *rt)
        ASSERT3U(rt->rt_type, <=, RANGE_SEG_NUM_TYPES);
        switch (rt->rt_type) {
        case RANGE_SEG32:
-               return (((range_seg32_t *)rs)->rs_start);
+               return (((const range_seg32_t *)rs)->rs_start);
        case RANGE_SEG64:
-               return (((range_seg64_t *)rs)->rs_start);
+               return (((const range_seg64_t *)rs)->rs_start);
        case RANGE_SEG_GAP:
-               return (((range_seg_gap_t *)rs)->rs_start);
+               return (((const range_seg_gap_t *)rs)->rs_start);
        default:
                VERIFY(0);
                return (0);
@@ -143,11 +143,11 @@ rs_get_end_raw(const range_seg_t *rs, const range_tree_t *rt)
        ASSERT3U(rt->rt_type, <=, RANGE_SEG_NUM_TYPES);
        switch (rt->rt_type) {
        case RANGE_SEG32:
-               return (((range_seg32_t *)rs)->rs_end);
+               return (((const range_seg32_t *)rs)->rs_end);
        case RANGE_SEG64:
-               return (((range_seg64_t *)rs)->rs_end);
+               return (((const range_seg64_t *)rs)->rs_end);
        case RANGE_SEG_GAP:
-               return (((range_seg_gap_t *)rs)->rs_end);
+               return (((const range_seg_gap_t *)rs)->rs_end);
        default:
                VERIFY(0);
                return (0);

diff --git a/module/zfs/dsl_scan.c b/module/zfs/dsl_scan.c
index b848f7ef3033c178e2bca3d9e7137eae075c4523..1f143e42174b829b994376bc8ab43dcbc3a71e78 100644 (file)
--- a/module/zfs/dsl_scan.c
+++ b/module/zfs/dsl_scan.c
@@ -1244,7 +1244,7 @@ dsl_scan_should_clear(dsl_scan_t *scn)
                if (queue != NULL) {
                        /* # extents in exts_by_size = # in exts_by_addr */
                        mused += zfs_btree_numnodes(&queue->q_exts_by_size) *
-                           sizeof (range_seg_t) + queue->q_sio_memused;
+                           sizeof (range_seg_gap_t) + queue->q_sio_memused;
                }
                mutex_exit(&tvd->vdev_scan_io_queue_lock);
        }