Author: mm
Date: Thu Aug 4 07:32:21 2011
New Revision: 224647
URL: http://svn.freebsd.org/changeset/base/224647
Log:
MFC r224579:
Fix integer overflow in txg_delay() by initializing
the variable "timeout" as clock_t.
Filed as Illumos Bug #1313
Reviewed by: avg
Modified:
stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
==============================================================================
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Thu Aug
4 07:29:08 2011 (r224646)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c Thu Aug
4 07:32:21 2011 (r224647)
@@ -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 ||
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
