sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

smbd: Simplify strict_lock_default with early returns

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Volker Lendecke 2014-07-10 22:23:37 +02:00 committed by Stefan Metzmacher
parent ff9a0a8993
commit 164e0cb23c
1 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
source3/locking/locking.c
View File

@ -103,6 +103,7 @@ void init_strict_lock_struct(files_struct *fsp,
bool strict_lock_default(files_struct *fsp, struct lock_struct *plock)
{
struct byte_range_lock *br_lck;
int strict_locking = lp_strict_locking(fsp->conn->params);
bool ret = False;
@ -115,44 +116,33 @@ bool strict_lock_default(files_struct *fsp, struct lock_struct *plock)
}
if (strict_locking == Auto) {
if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type) && (plock->lock_type == READ_LOCK || plock->lock_type == WRITE_LOCK)) {
DEBUG(10,("is_locked: optimisation - exclusive oplock on file %s\n", fsp_str_dbg(fsp)));
ret = True;
} else if ((fsp->oplock_type == LEVEL_II_OPLOCK) &&
(plock->lock_type == READ_LOCK)) {
DEBUG(10,("is_locked: optimisation - level II oplock on file %s\n", fsp_str_dbg(fsp)));
ret = True;
} else {
struct byte_range_lock *br_lck;
br_lck = brl_get_locks_readonly(fsp);
if (!br_lck) {
return True;
}
ret = brl_locktest(br_lck,
plock->context.smblctx,
plock->context.pid,
plock->start,
plock->size,
plock->lock_type,
plock->lock_flav);
if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type) &&
(plock->lock_type == READ_LOCK ||
plock->lock_type == WRITE_LOCK)) {
DEBUG(10, ("is_locked: optimisation - exclusive oplock "
"on file %s\n", fsp_str_dbg(fsp)));
return true;
}
} else {
struct byte_range_lock *br_lck;
br_lck = brl_get_locks_readonly(fsp);
if (!br_lck) {
return True;
if ((fsp->oplock_type == LEVEL_II_OPLOCK) &&
(plock->lock_type == READ_LOCK)) {
DEBUG(10, ("is_locked: optimisation - level II oplock "
"on file %s\n", fsp_str_dbg(fsp)));
return true;
}
ret = brl_locktest(br_lck,
plock->context.smblctx,
plock->context.pid,
plock->start,
plock->size,
plock->lock_type,
plock->lock_flav);
}
br_lck = brl_get_locks_readonly(fsp);
if (!br_lck) {
return true;
}
ret = brl_locktest(br_lck,
plock->context.smblctx,
plock->context.pid,
plock->start,
plock->size,
plock->lock_type,
plock->lock_flav);
DEBUG(10, ("strict_lock_default: flavour = %s brl start=%ju "
"len=%ju %s for fnum %ju file %s\n",
lock_flav_name(plock->lock_flav),