summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-07-18 01:17:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:12 -0500
commita456a3130925e946975620131f75b7c82e8a096b (patch)
tree600f1c5c67fdeae7fde294a325a77359ab3bf256 /source3/smbd
parentb737f26764cce935d9482335ece11c71a96720f4 (diff)
downloadsamba-a456a3130925e946975620131f75b7c82e8a096b.tar.gz
samba-a456a3130925e946975620131f75b7c82e8a096b.tar.bz2
samba-a456a3130925e946975620131f75b7c82e8a096b.zip
r17106: Match Windows timing values on locks.
Jeremy. (This used to be commit b5aaff665937313370e0e87225e146f9af7b7e67)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/reply.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 6176edb52d..bb79918675 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -5381,6 +5381,11 @@ int reply_lockingX(connection_struct *conn, char *inbuf, char *outbuf,
&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;
}