From a456a3130925e946975620131f75b7c82e8a096b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 18 Jul 2006 01:17:54 +0000 Subject: r17106: Match Windows timing values on locks. Jeremy. (This used to be commit b5aaff665937313370e0e87225e146f9af7b7e67) --- source3/smbd/reply.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3') 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; } -- cgit