diff options
| author | mm <mm@FreeBSD.org> | 2011-08-01 14:50:31 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2011-08-01 14:50:31 +0000 |
| commit | 877604c9bd06ac5b298e954286a4c300aaeb500c (patch) | |
| tree | d115d17e15a4e60c4ff3d286f02676b772353d69 /sys/cddl | |
| parent | fa73fbf6a632563142f9b1e401d77c4133b54fc5 (diff) | |
| download | FreeBSD-src-877604c9bd06ac5b298e954286a4c300aaeb500c.zip FreeBSD-src-877604c9bd06ac5b298e954286a4c300aaeb500c.tar.gz | |
Fix integer overflow in txg_delay() by initializing
the variable "timeout" as clock_t.
Filed as Illumos Bug #1313
Reviewed by: avg
Approved by: re (kib)
MFC after: 3 days
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c index 0885f27..7f9b933 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c @@ -488,7 +488,7 @@ void txg_delay(dsl_pool_t *dp, uint64_t txg, int ticks) { tx_state_t *tx = &dp->dp_tx; - int timeout = ddi_get_lbolt() + ticks; + clock_t timeout = ddi_get_lbolt() + ticks; /* don't delay if this txg could transition to quiesing immediately */ if (tx->tx_open_txg > txg || |
