Merge commit 'refs/top-bases/linux-docs' into linux-docs

This commit is contained in:
Brian Behlendorf 2008-12-18 10:06:07 -08:00
commit 27efe12078
1 changed files with 1 additions and 1 deletions
module/zfs

View File

@ -315,7 +315,7 @@ txg_sync_thread(dsl_pool_t *dp)
start = delta = 0;
for (;;) {
uint64_t timer, timeout = zfs_txg_timeout * hz;
uint64_t txg;
uint64_t txg, written;
/*
* We sync when we're scrubbing, there's someone waiting