]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Fix coverity defects: CID 147571, 147574
authorluozhengzheng <luo.zhengzheng@zte.com.cn>
Thu, 13 Oct 2016 21:25:05 +0000 (05:25 +0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 13 Oct 2016 21:25:05 +0000 (14:25 -0700)
CID 147571: Unintentional integer overflow (OVERFLOW_BEFORE_WIDEN)
CID 147574: Unintentional integer overflow (OVERFLOW_BEFORE_WIDEN)

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: luozhengzheng <luo.zhengzheng@zte.com.cn>
Closes #5268

module/zfs/dmu_tx.c
module/zfs/spa.c

index c50f732a70a53311208facd1b17888853739ced9..d8bd7cb787ba15d8309673e407c6d6c6bfbc5929 100644 (file)
@@ -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,
index bd1134e8f1e60d3469f8809460b3c5482d5c516e..9c29543b90cb58779044e195595e4e904e0ce90c 100644 (file)
@@ -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));