diff -r a4e1558c0599 usr/src/uts/common/fs/zfs/txg.c --- a/usr/src/uts/common/fs/zfs/txg.c Fri Jul 22 09:27:57 2011 -0700 +++ b/usr/src/uts/common/fs/zfs/txg.c Mon Aug 01 16:30:01 2011 +0200 @@ -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 ||