svn commit: samba r17106 - in branches/SAMBA_3_0/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2006-07-18 01:17:54 +0000 (Tue, 18 Jul 2006)
New Revision: 17106

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

Log:
Match Windows timing values on locks.
Jeremy.

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


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2006-07-18 01:05:51 UTC (rev 17105)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2006-07-18 01:17:54 UTC (rev 17106)
@@ -5381,6 +5381,11 @@
 					&status);
 
 			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 < 200) {
+					lock_timeout = 200;
+				}
 				defer_lock = True;
 			}