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)

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 3451b0cc1ab07592f0d866c4d99dd0ff768614e4..09c96b1286a58cb6ef173b704f4ecefe1fe2699c 100644 (file)
--- 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);
 }