svn commit: samba r5633 - in trunk/source/locking: .

[jra at samba.org]

Author: jra
Date: 2005-03-03 02:06:50 +0000 (Thu, 03 Mar 2005)
New Revision: 5633

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5633

Log:
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.

Modified:
   trunk/source/locking/brlock.c


Changeset:
Modified: trunk/source/locking/brlock.c
===================================================================
--- trunk/source/locking/brlock.c	2005-03-03 02:04:36 UTC (rev 5632)
+++ trunk/source/locking/brlock.c	2005-03-03 02:06:50 UTC (rev 5633)
@@ -132,11 +132,6 @@
 		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 @@
 			return False;
 	}
 
-	if (lck1->start >= (lck2->start + lck2->size) ||
-	    lck2->start >= (lck1->start + lck1->size))
-		return False;
-	    
 	return brl_overlap(lck1, lck2);
 }