diff options
| author | cao <[email protected]> | 2016-11-08 06:54:32 +0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-11-07 14:54:32 -0800 |
| commit | f4bae2ed6361917660f5238cd35672ad18d7babc (patch) | |
| tree | d6daaaee06823c7da02ed3ed066dc6e4bfbffb71 | |
| parent | 3779913b35634d9d34ac9eb709203275b28050c2 (diff) | |
Fix coverity defects: CID 147575, 147577, 147578, 147579
CID 147575, Type:Unintentional integer overflow
CID 147577, Type:Unintentional integer overflow
CID 147578, Type:Unintentional integer overflow
CID 147579, Type:Unintentional integer overflow
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: cao.xuewen <[email protected]>
Closes #5365
| -rw-r--r-- | lib/libzfs/libzfs_sendrecv.c | 2 | ||||
| -rw-r--r-- | module/zfs/dmu_tx.c | 2 | ||||
| -rw-r--r-- | module/zfs/dnode_sync.c | 2 | ||||
| -rw-r--r-- | module/zfs/metaslab.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/libzfs/libzfs_sendrecv.c b/lib/libzfs/libzfs_sendrecv.c index 21d67e74d..8926d1173 100644 --- a/lib/libzfs/libzfs_sendrecv.c +++ b/lib/libzfs/libzfs_sendrecv.c @@ -259,7 +259,7 @@ cksummer(void *arg) * a power of 2 if necessary. */ if (!ISP2(numbuckets)) - numbuckets = 1 << high_order_bit(numbuckets); + numbuckets = 1ULL << high_order_bit(numbuckets); ddt.dedup_hash_array = calloc(numbuckets, sizeof (dedup_entry_t *)); ddt.ddecache = umem_cache_create("dde", sizeof (dedup_entry_t), 0, diff --git a/module/zfs/dmu_tx.c b/module/zfs/dmu_tx.c index 3ee946885..f0119963c 100644 --- a/module/zfs/dmu_tx.c +++ b/module/zfs/dmu_tx.c @@ -755,7 +755,7 @@ dmu_tx_hold_zap(dmu_tx_t *tx, uint64_t object, int add, const char *name) * block. So there will be at most 2 blocks total, * including the header block. */ - dmu_tx_count_write(txh, 0, 2 << fzap_default_block_shift); + dmu_tx_count_write(txh, 0, 2ULL << fzap_default_block_shift); return; } diff --git a/module/zfs/dnode_sync.c b/module/zfs/dnode_sync.c index 6d1fa3339..527707104 100644 --- a/module/zfs/dnode_sync.c +++ b/module/zfs/dnode_sync.c @@ -292,7 +292,7 @@ free_children(dmu_buf_impl_t *db, uint64_t blkid, uint64_t nblks, } /* If this whole block is free, free ourself too. */ - for (i = 0, bp = db->db.db_data; i < 1 << epbs; i++, bp++) { + for (i = 0, bp = db->db.db_data; i < 1ULL << epbs; i++, bp++) { if (!BP_IS_HOLE(bp)) break; } diff --git a/module/zfs/metaslab.c b/module/zfs/metaslab.c index 37fa9a7a3..27a758ee0 100644 --- a/module/zfs/metaslab.c +++ b/module/zfs/metaslab.c @@ -1769,7 +1769,7 @@ metaslab_should_condense(metaslab_t *msp) range_seg_t *rs; uint64_t size, entries, segsz, object_size, optimal_size, record_size; dmu_object_info_t doi; - uint64_t vdev_blocksize = 1 << msp->ms_group->mg_vd->vdev_ashift; + uint64_t vdev_blocksize = 1ULL << msp->ms_group->mg_vd->vdev_ashift; ASSERT(MUTEX_HELD(&msp->ms_lock)); ASSERT(msp->ms_loaded); |