mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +03:00
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 commit is contained in:
parent
3da5006027
commit
ff4c201d93
@ -132,11 +132,6 @@ static BOOL brl_conflict(struct lock_struct *lck1,
|
|||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lck1->start >= (lck2->start + lck2->size) ||
|
|
||||||
lck2->start >= (lck1->start + lck1->size)) {
|
|
||||||
return False;
|
|
||||||
}
|
|
||||||
|
|
||||||
return brl_overlap(lck1, lck2);
|
return brl_overlap(lck1, lck2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -193,10 +188,6 @@ static BOOL brl_conflict_other(struct lock_struct *lck1, struct lock_struct *lck
|
|||||||
return False;
|
return False;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lck1->start >= (lck2->start + lck2->size) ||
|
|
||||||
lck2->start >= (lck1->start + lck1->size))
|
|
||||||
return False;
|
|
||||||
|
|
||||||
return brl_overlap(lck1, lck2);
|
return brl_overlap(lck1, lck2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user