sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-09 17:49:29 +03:00
Code Activity

smbd: Factor out fsps_lease_update()

Browse Source 
Less lines of code, less .text bytes with -O3

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke
2019-05-24 16:50:30 +02:00
committed by Jeremy Allison
parent 9891a44fd7
commit 953f9f7b6d
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source3/smbd/oplock.c
View File

@ -523,17 +523,16 @@ static void downgrade_lease_additional_trigger(struct tevent_context *ev,
}
}
struct downgrade_lease_fsps_state {
struct file_id id;
struct share_mode_lock *lck;
struct fsps_lease_update_state {
const struct file_id *id;
const struct smb2_lease_key *key;
};
static struct files_struct *downgrade_lease_fsps(struct files_struct *fsp,
void *private_data)
static struct files_struct *fsps_lease_update_fn(
struct files_struct *fsp, void *private_data)
{
struct downgrade_lease_fsps_state *state =
(struct downgrade_lease_fsps_state *)private_data;
struct fsps_lease_update_state *state =
(struct fsps_lease_update_state *)private_data;
if (fsp->oplock_type != LEASE_OPLOCK) {
return NULL;
@ -541,7 +540,7 @@ static struct files_struct *downgrade_lease_fsps(struct files_struct *fsp,
if (!smb2_lease_key_equal(&fsp->lease->lease.lease_key, state->key)) {
return NULL;
}
if (!file_id_equal(&fsp->file_id, &state->id)) {
if (!file_id_equal(&fsp->file_id, state->id)) {
return NULL;
}
@ -550,6 +549,14 @@ static struct files_struct *downgrade_lease_fsps(struct files_struct *fsp,
return NULL;
}
static void fsps_lease_update(struct smbd_server_connection *sconn,
const struct file_id *id,
const struct smb2_lease_key *key)
{
struct fsps_lease_update_state state = { .id = id, .key = key };
files_forall(sconn, fsps_lease_update_fn, &state);
}
NTSTATUS downgrade_lease(struct smbXsrv_connection *xconn,
uint32_t num_file_ids,
const struct file_id *ids,
@ -748,13 +755,7 @@ NTSTATUS downgrade_lease(struct smbXsrv_connection *xconn,
*/
lck->data->modified = true;
{
struct downgrade_lease_fsps_state state = {
.id = id, .lck = lck, .key = key,
};
files_forall(sconn, downgrade_lease_fsps, &state);
}
fsps_lease_update(sconn, &id, key);
TALLOC_FREE(lck);
DEBUG(10, ("%s: Downgrading %s to %x => %s\n", __func__,
@ -771,13 +772,7 @@ NTSTATUS downgrade_lease(struct smbXsrv_connection *xconn,
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
}
{
struct downgrade_lease_fsps_state state = {
.id = ids[i], .lck = lck, .key = key,
};
files_forall(sconn, downgrade_lease_fsps, &state);
}
fsps_lease_update(sconn, &ids[i], key);
DEBUG(10, ("%s: Downgrading %s to %x => %s\n", __func__,
file_id_string_tos(&ids[i]), (unsigned)lease_state, nt_errstr(status)));