diff options
| author | Volker Lendecke <vl@samba.org> | 2019-08-26 16:47:44 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-09-17 22:49:38 +0000 |
| commit | ad23d0f4f57e24a36960a1fa85f527e96753e4d2 (patch) | |
| tree | d90dbe1462bc2cfe22f7ae64cc32cf249935e046 /source3/locking | |
| parent | 5709856138d3149caf019bf70f9acf673efedec7 (diff) | |
| download | samba-ad23d0f4f57e24a36960a1fa85f527e96753e4d2.tar.gz | |
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>
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/locking.c | 11 |
1 files changed, 5 insertions, 6 deletions
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; } |