diff options
| author | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 2001-03-04 06:46:32 +0000 |
|---|---|---|
| committer | Constantine Sapuntzakis <csapuntz@cvs.openbsd.org> | 2001-03-04 06:46:32 +0000 |
| commit | 2a2351a07e18adc859600074e036115d910876ee (patch) | |
| tree | 79a47029f2e84bff26735d488cfeb27c2eec02c1 /sys | |
| parent | 1140a6349112d061ff9611cdf07630c0d723be83 (diff) | |
Fix use of timeouts. Thanks to Grigoriy Orlov (gluk)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 8a08ce5b8f2..a58b149a59d 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_softdep.c,v 1.17 2001/02/27 09:07:54 csapuntz Exp $ */ +/* $OpenBSD: ffs_softdep.c,v 1.18 2001/03/04 06:46:31 csapuntz Exp $ */ /* * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved. * @@ -1069,6 +1069,7 @@ softdep_initialize() sema_init(&inodedep_in_progress, "inodedep", PRIBIO, 0); newblk_hashtbl = hashinit(64, M_NEWBLK, M_WAITOK, &newblk_hash); sema_init(&newblk_in_progress, "newblk", PRIBIO, 0); + timeout_set(&proc_waiting_timeout, pause_timer, 0); } /* @@ -4609,10 +4610,8 @@ request_cleanup(resource, islocked) if (islocked == 0) ACQUIRE_LOCK(&lk); proc_waiting += 1; - if (!timeout_initialized(&proc_waiting_timeout)) { - timeout_set(&proc_waiting_timeout, pause_timer, 0); + if (!timeout_pending(&proc_waiting_timeout)) timeout_add(&proc_waiting_timeout, tickdelay > 2 ? tickdelay : 2); - } FREE_LOCK_INTERLOCKED(&lk); (void) tsleep((caddr_t)&proc_waiting, PPAUSE, "softupdate", 0); @@ -4636,8 +4635,6 @@ pause_timer(arg) wakeup_one(&proc_waiting); if (proc_waiting > 0) timeout_add(&proc_waiting_timeout, tickdelay > 2 ? tickdelay : 2); - else - timeout_del(&proc_waiting_timeout); } /* |