summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-08-17 23:30:18 +0000
committerAndrew Tridgell <tridge@samba.org>2002-08-17 23:30:18 +0000
commitc2831ae82c4b17d27651776ee599741c20f0e91f (patch)
tree0be97bd8f0bdd1a57aca01dea61ac2883b126543
parentb3ce3a877c5af840edcc07a7e053b939795086db (diff)
downloadsamba-c2831ae82c4b17d27651776ee599741c20f0e91f.tar.gz
samba-c2831ae82c4b17d27651776ee599741c20f0e91f.tar.bz2
samba-c2831ae82c4b17d27651776ee599741c20f0e91f.zip
amazing! we've had a reversed comparison in our blocking lock code
since 1998 and nobody noticed. It means that sometimes smbd would sit there forever, and smbd would never get the timing part of blocking locks right. (This used to be commit 5d4df58b6d4de548d8aa0a49ec307dce7cd1515a)
-rw-r--r--source3/smbd/blocking.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 6623c6df64..cb69b60144 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -576,7 +576,7 @@ void process_blocking_lock_queue(time_t t)
DEBUG(5,("process_blocking_lock_queue: examining pending lock fnum = %d for file %s\n",
fsp->fnum, fsp->fsp_name ));
- if((blr->expire_time != -1) && (blr->expire_time > t)) {
+ if((blr->expire_time != -1) && (blr->expire_time <= t)) {
/*
* Lock expired - throw away all previously
* obtained locks and return lock error.