svn commit: samba r17108 - in branches/SAMBA_3_0/source: param smbd

[jra at samba.org]

Author: jra
Date: 2006-07-18 01:29:43 +0000 (Tue, 18 Jul 2006)
New Revision: 17108

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17108

Log:
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.

Modified:
   branches/SAMBA_3_0/source/param/loadparm.c
   branches/SAMBA_3_0/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/param/loadparm.c
===================================================================
--- branches/SAMBA_3_0/source/param/loadparm.c	2006-07-18 01:20:26 UTC (rev 17107)
+++ branches/SAMBA_3_0/source/param/loadparm.c	2006-07-18 01:29:43 UTC (rev 17108)
@@ -1546,8 +1546,8 @@
 	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_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)

Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2006-07-18 01:20:26 UTC (rev 17107)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2006-07-18 01:29:43 UTC (rev 17108)
@@ -5383,8 +5383,8 @@
 			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 @@
 			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) {