Mercurial > illumos > illumos-gate

changeset 13487:78d9278724d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1313 Integer overflow in txg_delay() Reviewed by: Matthew Ahrens <matt@delphix.com> Reviewed by: Dan McDonald <danmcd@nexenta.com> Approved by: Eric Schrock <Eric.Schrock@delphix.com>
author Martin Matuska <mm@FreeBSD.org>
date Tue, 18 Oct 2011 18:08:05 -0700
parents e1a29ac96efa
children 87177e9d3436
files usr/src/uts/common/fs/zfs/txg.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/txg.c	Tue Oct 18 12:21:34 2011 -0700
+++ b/usr/src/uts/common/fs/zfs/txg.c	Tue Oct 18 18:08:05 2011 -0700
@@ -479,7 +479,7 @@
 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 ||