diff options
| author | Andrew Tridgell <tridge@samba.org> | 2002-08-18 20:09:02 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2002-08-18 20:09:02 +0000 |
| commit | f18c3c757a84734e45b8da8af2bc576c1ded73d2 (patch) | |
| tree | 8e0e1ee121319992b25a38f30adef3ddc7c63bcf /source3/smbd/process.c | |
| parent | db9a33fd38c1ac445e5edc1c80499ac3300a4824 (diff) | |
| download | samba-f18c3c757a84734e45b8da8af2bc576c1ded73d2.tar.gz samba-f18c3c757a84734e45b8da8af2bc576c1ded73d2.tar.xz samba-f18c3c757a84734e45b8da8af2bc576c1ded73d2.zip | |
added exact timing semantics on blocking locks
(This used to be commit aed32eb412cab7f6d0959f9faaaebdb320b2b6a8)
Diffstat (limited to 'source3/smbd/process.c')
| -rw-r--r-- | source3/smbd/process.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 55234ec896..13fd4998fe 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1032,13 +1032,8 @@ static int setup_select_timeout(void) int select_timeout; int t; - /* - * Increase the select timeout back to SMBD_SELECT_TIMEOUT if we - * have removed any blocking locks. JRA. - */ - - select_timeout = blocking_locks_pending() ? SMBD_SELECT_TIMEOUT_WITH_PENDING_LOCKS*1000 : - SMBD_SELECT_TIMEOUT*1000; + select_timeout = blocking_locks_timeout(SMBD_SELECT_TIMEOUT); + select_timeout *= 1000; t = change_notify_timeout(); if (t != -1) select_timeout = MIN(select_timeout, t*1000); |