c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 10:01:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix coverity defects: CID 165755

Browse Source 
CID 165755: Division or modulo by zero (DIVIDE_BY_ZERO)

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Closes #6352
This commit is contained in:
Giuseppe Di Natale 2017-07-24 11:16:58 -07:00 committed by Brian Behlendorf
parent 39554216df
commit 802ae562ed
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/zfs/mmp.c
View File

@ -378,7 +378,7 @@ mmp_thread(spa_t *spa)
* with fake, but reasonable, default non-zero values. * with fake, but reasonable, default non-zero values.
*/ */
mmp->mmp_delay = MSEC2NSEC(MAX(zfs_multihost_interval, mmp->mmp_delay = MSEC2NSEC(MAX(zfs_multihost_interval,
MMP_MIN_INTERVAL)) / vdev_count_leaves(spa); MMP_MIN_INTERVAL)) / MAX(vdev_count_leaves(spa), 1);
mmp->mmp_last_write = gethrtime() - mmp->mmp_delay; mmp->mmp_last_write = gethrtime() - mmp->mmp_delay;
while (!mmp->mmp_thread_exiting) { while (!mmp->mmp_thread_exiting) {
@ -392,7 +392,7 @@ mmp_thread(spa_t *spa)
start = gethrtime(); start = gethrtime();
if (multihost) { if (multihost) {
next_time = start + mmp_interval / next_time = start + mmp_interval /
vdev_count_leaves(spa); MAX(vdev_count_leaves(spa), 1);
} else { } else {
next_time = start + MSEC2NSEC(MMP_DEFAULT_INTERVAL); next_time = start + MSEC2NSEC(MMP_DEFAULT_INTERVAL);
} }

2
module/zfs/spa.c
View File

@ -2448,7 +2448,7 @@ spa_activity_check(spa_t *spa, uberblock_t *ub, nvlist_t *config)
*/ */
if (ub->ub_mmp_magic == MMP_MAGIC && ub->ub_mmp_delay) if (ub->ub_mmp_magic == MMP_MAGIC && ub->ub_mmp_delay)
import_delay = MAX(import_delay, import_intervals * import_delay = MAX(import_delay, import_intervals *
ub->ub_mmp_delay * vdev_count_leaves(spa)); ub->ub_mmp_delay * MAX(vdev_count_leaves(spa), 1));
/* Apply a floor using the local default values. */ /* Apply a floor using the local default values. */
import_delay = MAX(import_delay, import_intervals * import_delay = MAX(import_delay, import_intervals *