sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

smbd: Introduce a helper variable in delay_for_oplock()

Browse Source 
This removes a few explicit share_mode_lease dereferences

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>
This commit is contained in:
Volker Lendecke 2019-04-10 15:14:38 +02:00 committed by Christof Schmitt
parent 6e485441a6
commit 3eed19de04
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/smbd/open.c
View File

@ -1867,9 +1867,11 @@ static bool delay_for_oplock(files_struct *fsp,
uint32_t e_lease_type = get_lease_type(d, e); uint32_t e_lease_type = get_lease_type(d, e);
uint32_t break_to; uint32_t break_to;
uint32_t delay_mask = 0; uint32_t delay_mask = 0;
bool lease_is_breaking = false;
if (e_is_lease) { if (e_is_lease) {
l = &d->leases[e->lease_idx]; l = &d->leases[e->lease_idx];
lease_is_breaking = l->breaking;
} }
if (have_sharing_violation) { if (have_sharing_violation) {
@ -1906,7 +1908,7 @@ static bool delay_for_oplock(files_struct *fsp,
} }
if ((e_lease_type & ~break_to) == 0) { if ((e_lease_type & ~break_to) == 0) {
if (e_is_lease && l->breaking) { if (lease_is_breaking) {
delay = true; delay = true;
} }
continue; continue;
@ -1939,7 +1941,7 @@ static bool delay_for_oplock(files_struct *fsp,
if (e_lease_type & delay_mask) { if (e_lease_type & delay_mask) {
delay = true; delay = true;
} }
if (e_is_lease && l->breaking && !first_open_attempt) { if (lease_is_breaking && !first_open_attempt) {
delay = true; delay = true;
} }
continue; continue;