diff options
| author | Rafael Vanoni <rafael.vanoni@sun.com> | 2009-11-13 01:32:32 -0800 |
|---|---|---|
| committer | Rafael Vanoni <rafael.vanoni@sun.com> | 2009-11-13 01:32:32 -0800 |
| commit | d3d50737e566cade9a08d73d2af95105ac7cd960 (patch) | |
| tree | 399b76a3f6bf107e2ff506d8f9c3333654b29fc7 /usr/src/uts/common/fs/zfs/dsl_scrub.c | |
| parent | 1eff5f7761619411b3c31280fcd96cefc32968b7 (diff) | |
| download | illumos-joyent-d3d50737e566cade9a08d73d2af95105ac7cd960.tar.gz | |
PSARC/2009/396 Tickless Kernel Architecture / lbolt decoupling
6860030 tickless clock requires a clock() decoupled lbolt / lbolt64
Portions contributed by Chad Mynhier <cmynhier@gmail.com>
Diffstat (limited to 'usr/src/uts/common/fs/zfs/dsl_scrub.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/dsl_scrub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/zfs/dsl_scrub.c b/usr/src/uts/common/fs/zfs/dsl_scrub.c index d1fb3d2e52..d511bb841a 100644 --- a/usr/src/uts/common/fs/zfs/dsl_scrub.c +++ b/usr/src/uts/common/fs/zfs/dsl_scrub.c @@ -313,7 +313,7 @@ scrub_pause(dsl_pool_t *dp, const zbookmark_t *zb) mintime = dp->dp_scrub_isresilver ? zfs_resilver_min_time : zfs_scrub_min_time; - elapsed_ticks = lbolt64 - dp->dp_scrub_start_time; + elapsed_ticks = ddi_get_lbolt64() - dp->dp_scrub_start_time; if (elapsed_ticks > hz * zfs_txg_timeout || (elapsed_ticks > hz * mintime && txg_sync_waiting(dp))) { dprintf("pausing at %llx/%llx/%llx/%llx\n", @@ -836,7 +836,7 @@ dsl_pool_scrub_sync(dsl_pool_t *dp, dmu_tx_t *tx) } dp->dp_scrub_pausing = B_FALSE; - dp->dp_scrub_start_time = lbolt64; + dp->dp_scrub_start_time = ddi_get_lbolt64(); dp->dp_scrub_isresilver = (dp->dp_scrub_min_txg != 0); spa->spa_scrub_active = B_TRUE; |