summaryrefslogtreecommitdiff
path: root/source3/locking
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2019-08-26 16:51:56 +0200
committerJeremy Allison <jra@samba.org>2019-09-17 22:49:38 +0000
commit4d512f40f9f6c1689cc4e0ace541079fda98c611 (patch)
tree476e4fea84375a2e2a2d1687712dd0cca1ca1c32 /source3/locking
parentad23d0f4f57e24a36960a1fa85f527e96753e4d2 (diff)
downloadsamba-4d512f40f9f6c1689cc4e0ace541079fda98c611.tar.gz
smbd: Pass share_mode_lock to remove_lease_if_stale()
We'll want to use share_mode_forall_entries next 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.c5
-rw-r--r--source3/locking/proto.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 71701a134df..c5bbb6d502b 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -674,10 +674,11 @@ bool is_valid_share_mode_entry(const struct share_mode_entry *e)
return (num_props != 0);
}
-NTSTATUS remove_lease_if_stale(const struct share_mode_data *d,
+NTSTATUS remove_lease_if_stale(struct share_mode_lock *lck,
const struct GUID *client_guid,
const struct smb2_lease_key *lease_key)
{
+ struct share_mode_data *d = lck->data;
uint32_t i;
NTSTATUS status;
@@ -729,7 +730,7 @@ static void remove_share_mode_lease(struct share_mode_lock *lck,
return;
}
- remove_lease_if_stale(lck->data, &e->client_guid, &e->lease_key);
+ remove_lease_if_stale(lck, &e->client_guid, &e->lease_key);
}
bool share_entry_stale_pid(struct share_mode_entry *e)
diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index a404fb6530b..f99984b23c2 100644
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -184,7 +184,7 @@ bool reset_share_mode_entry(
struct server_id new_pid,
uint64_t new_mid,
uint64_t new_share_file_id);
-NTSTATUS remove_lease_if_stale(const struct share_mode_data *d,
+NTSTATUS remove_lease_if_stale(struct share_mode_lock *lck,
const struct GUID *client_guid,
const struct smb2_lease_key *lease_key);
void remove_stale_share_mode_entries(struct share_mode_data *d);