s3:blocking: Remove bug reproducer from a few commits ago
authorStefan Metzmacher <metze@samba.org>
Thu, 15 Aug 2019 14:44:11 +0000 (16:44 +0200)
committerStefan Metzmacher <metze@samba.org>
Mon, 9 Sep 2019 16:04:29 +0000 (16:04 +0000)
The problem is fixed, now we can revert the change that made it
easier to trigger.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14113

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit 62ec58b06c38ee82bb3147c4d325413fd3a76499)

source3/smbd/blocking.c

index 587923aa5ec18754356370b1c10a0dfa3fe6af67..af889a10d62178abaf8fea5b1c2d622dd339b106 100644 (file)
@@ -239,7 +239,7 @@ struct tevent_req *smbd_smb1_do_locks_send(
 
                DBG_DEBUG("Blocked on a posix lock. Retry in one second\n");
 
-               tmp = timeval_current_ofs(15, 0);
+               tmp = timeval_current_ofs(1, 0);
                endtime = timeval_min(&endtime, &tmp);
        }
 
@@ -375,7 +375,7 @@ static void smbd_smb1_do_locks_try(struct tevent_req *req)
 
                DBG_DEBUG("Blocked on a posix lock. Retry in one second\n");
 
-               tmp = timeval_current_ofs(15, 0);
+               tmp = timeval_current_ofs(1, 0);
                endtime = timeval_min(&endtime, &tmp);
        }