sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

smbd: Adapt brl_pending_overlap to README.Coding

Browse Source 
Just reformatting, no behaviour change. This just looked too ugly to me.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue May 28 22:22:28 UTC 2019 on sn-devel-184
This commit is contained in:
Volker Lendecke 2019-05-27 16:21:12 +02:00 committed by Jeremy Allison
parent 4a93fc686f
commit 73080f255e
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/locking/brlock.c
View File

@ -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;
}
/****************************************************************************