From: Volker Lendecke <vl@samba.org>
Date: Mon, 26 Aug 2019 14:47:44 +0000 (+0200)
Subject: smbd: Pass share_mode_lock to remove_share_mode_lease()
X-Git-Tag: talloc-2.3.1~787
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=ad23d0f4f57e24a36960a1fa85f527e96753e4d2

smbd: Pass share_mode_lock to remove_share_mode_lease()

Later we'll need "lck" further down

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

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 6e1e577b468..71701a134df 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -715,7 +715,7 @@ NTSTATUS remove_lease_if_stale(const struct share_mode_data *d,
  * share mode that is being marked stale or deleted.
  */
 
-static void remove_share_mode_lease(struct share_mode_data *d,
+static void remove_share_mode_lease(struct share_mode_lock *lck,
 				    struct share_mode_entry *e)
 {
 	uint16_t op_type;
@@ -723,13 +723,13 @@ static void remove_share_mode_lease(struct share_mode_data *d,
 	op_type = e->op_type;
 	e->op_type = NO_OPLOCK;
 
-	d->modified = true;
+	lck->data->modified = true;
 
 	if (op_type != LEASE_OPLOCK) {
 		return;
 	}
 
-	remove_lease_if_stale(d, &e->client_guid, &e->lease_key);
+	remove_lease_if_stale(lck->data, &e->client_guid, &e->lease_key);
 }
 
 bool share_entry_stale_pid(struct share_mode_entry *e)
@@ -886,7 +886,7 @@ bool del_share_mode(struct share_mode_lock *lck, files_struct *fsp)
 	if (e == NULL) {
 		return False;
 	}
-	remove_share_mode_lease(lck->data, e);
+	remove_share_mode_lease(lck, e);
 	*e = lck->data->share_modes[lck->data->num_share_modes-1];
 	lck->data->num_share_modes -= 1;
 	return True;
@@ -936,7 +936,6 @@ bool mark_share_mode_disconnected(struct share_mode_lock *lck,
 
 bool remove_share_oplock(struct share_mode_lock *lck, files_struct *fsp)
 {
-	struct share_mode_data *d = lck->data;
 	struct share_mode_entry *e;
 
 	e = find_share_mode_entry(
@@ -947,7 +946,7 @@ bool remove_share_oplock(struct share_mode_lock *lck, files_struct *fsp)
 		return False;
 	}
 
-	remove_share_mode_lease(d, e);
+	remove_share_mode_lease(lck, e);
 	return true;
 }