From 70fd809db6b3d67077e42338e1b68310754278e2 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 10 Apr 2019 14:05:15 +0200 Subject: [PATCH] smbd: Use share_mode_entry's lease data in delay_for_oplock() This was the last "share_mode_lease" reference in this function, remove variable "l". Signed-off-by: Volker Lendecke Reviewed-by: Christof Schmitt --- source3/smbd/open.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/source3/smbd/open.c b/source3/smbd/open.c index cdef53c23ee..6d22550abfb 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -1863,15 +1863,13 @@ static bool delay_for_oplock(files_struct *fsp, for (i=0; inum_share_modes; i++) { struct share_mode_entry *e = &d->share_modes[i]; bool e_is_lease = (e->op_type == LEASE_OPLOCK); - struct share_mode_lease *l = NULL; uint32_t e_lease_type = get_lease_type(d, e); uint32_t break_to; uint32_t delay_mask = 0; bool lease_is_breaking = false; if (e_is_lease) { - l = &d->leases[e->lease_idx]; - lease_is_breaking = l->breaking; + lease_is_breaking = d->leases[e->lease_idx].breaking; } if (have_sharing_violation) { @@ -1900,8 +1898,8 @@ static bool delay_for_oplock(files_struct *fsp, ign = smb2_lease_equal(fsp_client_guid(fsp), &lease->lease_key, - &l->client_guid, - &l->lease_key); + &e->client_guid, + &e->lease_key); if (ign) { continue; } -- 2.34.1