git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Illumos #1313: Integer overflow in txg_delay()
[zfs.git]
/
module
/
zfs
/
txg.c
diff --git
a/module/zfs/txg.c
b/module/zfs/txg.c
index
340c42a
..
d0d2b17
100644
(file)
--- a/
module/zfs/txg.c
+++ b/
module/zfs/txg.c
@@
-506,7
+506,7
@@
void
txg_delay(dsl_pool_t *dp, uint64_t txg, int ticks)
{
tx_state_t *tx = &dp->dp_tx;
txg_delay(dsl_pool_t *dp, uint64_t txg, int ticks)
{
tx_state_t *tx = &dp->dp_tx;
-
in
t 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 ||
/* don't delay if this txg could transition to quiesing immediately */
if (tx->tx_open_txg > txg ||