diff options
| author | Paul Dagnelie <pcd@delphix.com> | 2019-12-18 09:35:57 -0700 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-12-19 13:45:25 -0700 |
| commit | 028b5df8ad1713f1c0c8ba060ec660fe0a20261d (patch) | |
| tree | 3359ca37a182becc0b493b98f7b1ea17a428f8b2 | |
| parent | 2c4824dbe94f4768dd1a5058fc108fc83513cf59 (diff) | |
| download | illumos-joyent-028b5df8ad1713f1c0c8ba060ec660fe0a20261d.tar.gz | |
12095 Don't call sizeof on void
Portions contributed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Ryan Moeller <ryan@ixsystems.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Reviewed by: Matt Macy <mmacy@FreeBSD.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Joice McIntosh <joicemcintosh@yahoo.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_scan.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/sys/range_tree.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_scan.c b/usr/src/uts/common/fs/zfs/dsl_scan.c index 9d2b7a509c..81c7d599a4 100644 --- a/usr/src/uts/common/fs/zfs/dsl_scan.c +++ b/usr/src/uts/common/fs/zfs/dsl_scan.c @@ -1241,7 +1241,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); } diff --git a/usr/src/uts/common/fs/zfs/sys/range_tree.h b/usr/src/uts/common/fs/zfs/sys/range_tree.h index d80faa933e..6e0025a2f1 100644 --- a/usr/src/uts/common/fs/zfs/sys/range_tree.h +++ b/usr/src/uts/common/fs/zfs/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); |