diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2011-10-18 18:08:05 -0700 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2011-10-18 18:08:05 -0700 |
| commit | 61bb40ed88d2b0deb9ccb8f6626ace833fadc137 (patch) | |
| tree | 9bbfc0db8f93b408c4e12c2d255c916b21fb2c8c /usr/src | |
| parent | 462453d2d0c563559a4caf186db76954e563bd1a (diff) | |
| download | illumos-joyent-61bb40ed88d2b0deb9ccb8f6626ace833fadc137.tar.gz | |
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>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/txg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/fs/zfs/txg.c b/usr/src/uts/common/fs/zfs/txg.c index 9b308ca4e7..ed454aa87b 100644 --- a/usr/src/uts/common/fs/zfs/txg.c +++ b/usr/src/uts/common/fs/zfs/txg.c @@ -479,7 +479,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 || |