summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Dagnelie <[email protected]>2019-10-13 19:21:51 -0700
committerBrian Behlendorf <[email protected]>2019-10-13 19:21:51 -0700
commit511fce6b1f939bd78687924aaa35dc83f8056ced (patch)
treec1a9036236debd0bd778327d4c6849f2512a3981
parentcdbba101f48bef68b46363a64880b51fa647ad45 (diff)
Don't call sizeof on void
We get the sizeof the appropriate type, and don't cast away const. Reviewed-by: Ryan Moeller <[email protected]> Reviewed-by: Igor Kozhukhov <[email protected]> Reviewed-by: Matt Macy <[email protected]> Signed-off-by: Paul Dagnelie <[email protected]> Closes #9455
-rw-r--r--include/sys/range_tree.h12
-rw-r--r--module/zfs/dsl_scan.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/include/sys/range_tree.h b/include/sys/range_tree.h
index d80faa933..6e0025a2f 100644
--- 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 b848f7ef3..1f143e421 100644
--- 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);
}