summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-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;
}