summaryrefslogtreecommitdiff
path: root/source3/locking
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-03-03 02:07:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:51 -0500
commit8dddd763d876cc7a340ffb7813f87187d77b84f2 (patch)
tree2957cf449793b04bdaefedc13878026a7b409198 /source3/locking
parent5713c65a82564b5fdb9ecbbd650ade7f302492c2 (diff)
downloadsamba-8dddd763d876cc7a340ffb7813f87187d77b84f2.tar.gz
samba-8dddd763d876cc7a340ffb7813f87187d77b84f2.tar.bz2
samba-8dddd763d876cc7a340ffb7813f87187d77b84f2.zip
r5634: Fix 64-bit overflow problems found by BlueArc torture tester.
We still have a few strange bugs with 64-bit locking values. I will get traces. Jeremy. (This used to be commit ff4c201d93e1f59ce61e9341f7f94ce92389ed7b)
Diffstat (limited to 'source3/locking')
-rw-r--r--source3/locking/brlock.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 3451b0cc1a..09c96b1286 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -132,11 +132,6 @@ static BOOL brl_conflict(struct lock_struct *lck1,
return False;
}
- if (lck1->start >= (lck2->start + lck2->size) ||
- lck2->start >= (lck1->start + lck1->size)) {
- return False;
- }
-
return brl_overlap(lck1, lck2);
}
@@ -193,10 +188,6 @@ static BOOL brl_conflict_other(struct lock_struct *lck1, struct lock_struct *lck
return False;
}
- if (lck1->start >= (lck2->start + lck2->size) ||
- lck2->start >= (lck1->start + lck1->size))
- return False;
-
return brl_overlap(lck1, lck2);
}