X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2Flocking%2Fbrlock.c;h=5a4bd0d5c06381c818ff4e5aad48f45dae791c66;hb=73080f255e379ed030005031f560c3ed71919b06;hp=31e0f857d5c319b843c4fc84dfebda7912eaaf27;hpb=4a93fc686fafe4ffbe72271f4093bde6aa607b2a;p=metze%2Fsamba%2Fwip.git diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 31e0f857d5c3..5a4bd0d5c063 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -295,13 +295,18 @@ static bool brl_conflict_other(const struct lock_struct *lock, Check if an unlock overlaps a pending lock. ****************************************************************************/ -static bool brl_pending_overlap(const struct lock_struct *lock, const struct lock_struct *pend_lock) +static bool brl_pending_overlap(const struct lock_struct *lock, + const struct lock_struct *pend_lock) { - if ((lock->start <= pend_lock->start) && (lock->start + lock->size > pend_lock->start)) - return True; - if ((lock->start >= pend_lock->start) && (lock->start < pend_lock->start + pend_lock->size)) - return True; - return False; + if ((lock->start <= pend_lock->start) && + (lock->start + lock->size > pend_lock->start)) { + return true; + } + if ((lock->start >= pend_lock->start) && + (lock->start < pend_lock->start + pend_lock->size)) { + return true; + } + return false; } /****************************************************************************