diff options
| author | Gerald Carter <jerry@samba.org> | 2005-03-11 10:52:54 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-03-11 10:52:54 +0000 |
| commit | 061a07f6b476428c622618d83a5a1e54c5f05fe5 (patch) | |
| tree | 5e926c06e720253210687391b68aa82f553c9ad3 /source/locking | |
| parent | 6c30768e14f5639328e06a73940f133f9078b90e (diff) | |
| download | samba-061a07f6b476428c622618d83a5a1e54c5f05fe5.tar.gz samba-061a07f6b476428c622618d83a5a1e54c5f05fe5.tar.xz samba-061a07f6b476428c622618d83a5a1e54c5f05fe5.zip | |
r5739: sync for 3.0.12rc1 (current with SAMBA_3_0 r5738)
Diffstat (limited to 'source/locking')
| -rw-r--r-- | source/locking/brlock.c | 9 | ||||
| -rw-r--r-- | source/locking/posix.c | 8 |
2 files changed, 4 insertions, 13 deletions
diff --git a/source/locking/brlock.c b/source/locking/brlock.c index 3451b0cc1ab..09c96b1286a 100644 --- a/source/locking/brlock.c +++ b/source/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); } diff --git a/source/locking/posix.c b/source/locking/posix.c index 6ab2ed377e2..95d4518c172 100644 --- a/source/locking/posix.c +++ b/source/locking/posix.c @@ -563,9 +563,9 @@ static BOOL posix_lock_in_range(SMB_OFF_T *offset_out, SMB_OFF_T *count_out, * and the underlying system can handle 64 bit signed locks. */ - SMB_OFF_T mask2 = ((SMB_OFF_T)0x4) << (SMB_OFF_T_BITS-4); - SMB_OFF_T mask = (mask2<<1); - SMB_OFF_T max_positive_lock_offset = ~mask; + SMB_OFF_T mask2 = ((SMB_OFF_T)0x4) << (SMB_OFF_T_BITS-4); + SMB_OFF_T mask = (mask2<<1); + SMB_OFF_T max_positive_lock_offset = ~mask; #else /* !LARGE_SMB_OFF_T || HAVE_BROKEN_FCNTL64_LOCKS */ @@ -575,7 +575,7 @@ static BOOL posix_lock_in_range(SMB_OFF_T *offset_out, SMB_OFF_T *count_out, * All offsets & counts must be 2^31 or less. */ - SMB_OFF_T max_positive_lock_offset = 0x7FFFFFFF; + SMB_OFF_T max_positive_lock_offset = 0x7FFFFFFF; #endif /* !LARGE_SMB_OFF_T || HAVE_BROKEN_FCNTL64_LOCKS */ |