Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2008-12-18 10:07:21 -08:00
parent 80ce7621bc 5c7ee1347b
commit 3fa5220373
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/zfs/txg.c
View File

@ -315,7 +315,7 @@ txg_sync_thread(dsl_pool_t *dp)
start = delta = 0; start = delta = 0;
for (;;) { for (;;) {
uint64_t timer, timeout = zfs_txg_timeout * hz; 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 * We sync when we're scrubbing, there's someone waiting