diff options
| author | luozhengzheng <[email protected]> | 2016-10-14 05:25:05 +0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-10-13 14:25:05 -0700 |
| commit | 05852b3467b44cdf88541ec67624cd1f5f2ded1d (patch) | |
| tree | 0dee222df98e2cf5f4eb2c38be2d59e6e7484533 | |
| parent | e8d3dcdfb15cdbd946407f6d8f0131e88ff05011 (diff) | |
Fix coverity defects: CID 147571, 147574
CID 147571: Unintentional integer overflow (OVERFLOW_BEFORE_WIDEN)
CID 147574: Unintentional integer overflow (OVERFLOW_BEFORE_WIDEN)
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: luozhengzheng <[email protected]>
Closes #5268
| -rw-r--r-- | module/zfs/dmu_tx.c | 2 | ||||
| -rw-r--r-- | module/zfs/spa.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/dmu_tx.c b/module/zfs/dmu_tx.c index c50f732a7..d8bd7cb78 100644 --- a/module/zfs/dmu_tx.c +++ b/module/zfs/dmu_tx.c @@ -409,7 +409,7 @@ dmu_tx_count_dnode(dmu_tx_hold_t *txh) dnode_t *dn = txh->txh_dnode; dnode_t *mdn = DMU_META_DNODE(txh->txh_tx->tx_objset); uint64_t space = mdn->dn_datablksz + - ((mdn->dn_nlevels-1) << mdn->dn_indblkshift); + ((uint64_t)(mdn->dn_nlevels-1) << mdn->dn_indblkshift); if (dn && dn->dn_dbuf->db_blkptr && dsl_dataset_block_freeable(dn->dn_objset->os_dsl_dataset, diff --git a/module/zfs/spa.c b/module/zfs/spa.c index bd1134e8f..9c29543b9 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -5928,7 +5928,7 @@ spa_async_tasks_pending(spa_t *spa) } else { config_task_suspended = (gethrtime() - spa->spa_ccw_fail_time) < - (zfs_ccw_retry_interval * NANOSEC); + ((hrtime_t)zfs_ccw_retry_interval * NANOSEC); } return (non_config_tasks || (config_task && !config_task_suspended)); |