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: Add share_mode_count_entries()

Browse Source 
In order to not write the share mode on every open/close, we need to get rid of
share_mode_data->num_share_modes. "net tdb" needs this information precisely
though, and it's pretty cheap to calculate.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke
2019-11-29 15:45:22 +01:00
committed by Jeremy Allison
parent 54293f92cd
commit 28d9c41860
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source3/locking/proto.h
View File

@ -244,6 +244,7 @@ bool share_mode_forall_entries(
void *private_data), void *private_data),
void *private_data); void *private_data);
NTSTATUS share_mode_count_entries(struct file_id fid, size_t *num_share_modes);
/* The following definitions come from locking/posix.c */ /* The following definitions come from locking/posix.c */

46
source3/locking/share_mode_lock.c
View File

@ -1838,6 +1838,52 @@ bool share_mode_forall_entries(
return state.ok; return state.ok;
} }
struct share_mode_count_entries_state {
size_t num_share_modes;
NTSTATUS status;
};
static void share_mode_count_entries_fn(
TDB_DATA key, TDB_DATA data, void *private_data)
{
struct share_mode_count_entries_state *state = private_data;
if ((data.dsize % SHARE_MODE_ENTRY_SIZE) != 0) {
DBG_WARNING("Invalid data size %zu\n", data.dsize);
state->status = NT_STATUS_INTERNAL_DB_CORRUPTION;
return;
}
state->num_share_modes = data.dsize / SHARE_MODE_ENTRY_SIZE;
state->status = NT_STATUS_OK;
}
NTSTATUS share_mode_count_entries(struct file_id fid, size_t *num_share_modes)
{
struct share_mode_count_entries_state state = {
.status = NT_STATUS_NOT_FOUND,
};
NTSTATUS status;
status = dbwrap_parse_record(
share_entries_db,
locking_key(&fid),
share_mode_count_entries_fn,
&state);
if (!NT_STATUS_IS_OK(status)) {
DBG_DEBUG("dbwrap_parse_record failed: %s\n",
nt_errstr(status));
return status;
}
if (!NT_STATUS_IS_OK(state.status)) {
DBG_DEBUG("share_mode_forall_entries_fn failed: %s\n",
nt_errstr(state.status));
return state.status;
}
*num_share_modes = state.num_share_modes;
return NT_STATUS_OK;
}
struct share_mode_entry_do_state { struct share_mode_entry_do_state {
struct server_id pid; struct server_id pid;
uint64_t share_file_id; uint64_t share_file_id;