summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--source/locking/locking.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/locking/locking.c b/source/locking/locking.c
index 8f3e4a278e1..1090b0fcbf5 100644
--- a/source/locking/locking.c
+++ b/source/locking/locking.c
@@ -155,12 +155,16 @@ NTSTATUS do_lock_spin(files_struct *fsp,connection_struct *conn, uint16 lock_pid
int sleeptime = lp_lock_sleep_time();
NTSTATUS status;
+ if (maxj <= 0)
+ maxj = 1;
+
for (j = 0; j < maxj; j++) {
status = do_lock(fsp, conn, lock_pid, count, offset, lock_type);
if (!NT_STATUS_EQUAL(status, NT_STATUS_LOCK_NOT_GRANTED) &&
!NT_STATUS_EQUAL(status, NT_STATUS_FILE_LOCK_CONFLICT))
break;
- usleep(sleeptime);
+ if (sleeptime)
+ usleep(sleeptime);
}
return status;
}