sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

smbd: Simplify share_mode_lock_destructor()

Browse Source 
Rely on the truth in the database whether we found share modes or
not, share_mode_data_store() has that information for free.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke
2020-12-03 17:02:10 +01:00
committed by Jeremy Allison
parent 0f40c4ab63
commit 05f9e8f999
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source3/locking/share_mode_lock.c
View File

@ -638,7 +638,8 @@ fail:
If modified, store the share_mode_data back into the database.
********************************************************************/
static NTSTATUS share_mode_data_store(struct share_mode_data *d)
static NTSTATUS share_mode_data_store(
struct share_mode_data *d, bool *have_share_entries)
{
TDB_DATA key = locking_key(&d->id);
struct locking_tdb_data *ltdb = NULL;
@ -676,6 +677,8 @@ static NTSTATUS share_mode_data_store(struct share_mode_data *d)
TALLOC_FREE(ltdb);
return ndr_map_error2ntstatus(ndr_err);
}
*have_share_entries = true;
}
ltdb->share_mode_data_buf = blob.data;
@ -947,6 +950,7 @@ fail:
static int share_mode_lock_destructor(struct share_mode_lock *lck)
{
bool have_share_entries = false;
NTSTATUS status;
SMB_ASSERT(static_share_mode_data_refcount > 0);
@ -956,7 +960,8 @@ static int share_mode_lock_destructor(struct share_mode_lock *lck)
return 0;
}
status = share_mode_data_store(static_share_mode_data);
status = share_mode_data_store(
static_share_mode_data, &have_share_entries);
if (!NT_STATUS_IS_OK(status)) {
DBG_ERR("share_mode_data_store failed: %s\n",
nt_errstr(status));
@ -975,7 +980,7 @@ static int share_mode_lock_destructor(struct share_mode_lock *lck)
}
}
if (static_share_mode_data->have_share_modes) {
if (have_share_entries) {
/*
* This is worth keeping. Without share modes,
* share_mode_data_store above has left nothing in the