diff options
| author | Jeremy Allison <jra@samba.org> | 2006-07-18 01:29:43 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:12 -0500 |
| commit | 1cd8d56fdab18a0bcedffba6476f8208d2185040 (patch) | |
| tree | f449d0c908d9f70116d987fb2d3cbfdce7cd64c6 /source3 | |
| parent | 38af904c314396091de1062ec19591326abddec6 (diff) | |
| download | samba-1cd8d56fdab18a0bcedffba6476f8208d2185040.tar.gz samba-1cd8d56fdab18a0bcedffba6476f8208d2185040.tar.bz2 samba-1cd8d56fdab18a0bcedffba6476f8208d2185040.zip | |
r17108: Make the default timeout parameter for lock waiting
be lp_lock_spin(). lock spin count is no longer
used. I'll update the man pages.
Jeremy.
(This used to be commit 0451a170c9be88399202abd225af35ddc45023f0)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 6 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index b4b6c2bd10..acb54f25df 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1546,8 +1546,8 @@ static void init_globals(BOOL first_time_only) Globals.map_to_guest = 0; /* By Default, "Never" */ Globals.oplock_break_wait_time = 0; /* By Default, 0 msecs. */ Globals.enhanced_browsing = True; - Globals.iLockSpinCount = 3; /* Try 3 times. */ - Globals.iLockSpinTime = 10; /* usec. */ + Globals.iLockSpinCount = 0; /* Unused. */ + Globals.iLockSpinTime = WINDOWS_MINIMUM_LOCK_TIMEOUT_MS; /* msec. */ #ifdef MMAP_BLACKLIST Globals.bUseMmap = False; #else @@ -1948,7 +1948,7 @@ FN_GLOBAL_INTEGER(lp_machine_password_timeout, &Globals.machine_password_timeout FN_GLOBAL_INTEGER(lp_map_to_guest, &Globals.map_to_guest) FN_GLOBAL_INTEGER(lp_oplock_break_wait_time, &Globals.oplock_break_wait_time) FN_GLOBAL_INTEGER(lp_lock_spin_count, &Globals.iLockSpinCount) -FN_GLOBAL_INTEGER(lp_lock_sleep_time, &Globals.iLockSpinTime) +FN_GLOBAL_INTEGER(lp_lock_spin_time, &Globals.iLockSpinTime) FN_GLOBAL_INTEGER(lp_usershare_max_shares, &Globals.iUsershareMaxShares) FN_LOCAL_STRING(lp_preexec, szPreExec) diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index f1ac098e7d..edaf5d8062 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -5383,8 +5383,8 @@ int reply_lockingX(connection_struct *conn, char *inbuf, char *outbuf, if (br_lck && blocking_lock && ERROR_WAS_LOCK_DENIED(status)) { /* Windows internal resolution for blocking locks seems to be about 200ms... Don't wait for less than that. JRA. */ - if (lock_timeout != -1 && lock_timeout < WINDOWS_MINIMUM_LOCK_TIMEOUT_MS) { - lock_timeout = WINDOWS_MINIMUM_LOCK_TIMEOUT_MS; + if (lock_timeout != -1 && lock_timeout < lp_lock_spin_time()) { + lock_timeout = lp_lock_spin_time(); } defer_lock = True; } @@ -5397,7 +5397,7 @@ int reply_lockingX(connection_struct *conn, char *inbuf, char *outbuf, if (br_lck && lp_blocking_locks(SNUM(conn)) && !blocking_lock && NT_STATUS_EQUAL((status), NT_STATUS_FILE_LOCK_CONFLICT)) { defer_lock = True; - lock_timeout = WINDOWS_MINIMUM_LOCK_TIMEOUT_MS; + lock_timeout = lp_lock_spin_time(); } if (br_lck && defer_lock) { |