sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s3:locking: simplify code in get_share_mode_lock()

Browse Source 
The call to get_static_share_mode_data() is identical in the if/else branches,
so move it behind them.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Dec  5 20:12:23 UTC 2019 on sn-devel-184
This commit is contained in:
Ralph Boehme 2019-11-28 10:18:29 +00:00 committed by Jeremy Allison
parent e30607aff3
commit 809247973d
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source3/locking/share_mode_lock.c
View File

@ -615,18 +615,6 @@ struct share_mode_lock *get_share_mode_lock(
static_share_mode_record_value = dbwrap_record_get_value(
static_share_mode_record);
status = get_static_share_mode_data(
static_share_mode_record,
id,
servicepath,
smb_fname,
old_write_time);
if (!NT_STATUS_IS_OK(status)) {
DBG_DEBUG("get_static_share_mode_data failed: %s\n",
nt_errstr(status));
TALLOC_FREE(static_share_mode_record);
goto fail;
}
} else {
TDB_DATA static_key;
int cmp;
@ -639,18 +627,18 @@ struct share_mode_lock *get_share_mode_lock(
"simultaneously\n");
return NULL;
}
}
status = get_static_share_mode_data(
static_share_mode_record,
id,
servicepath,
smb_fname,
old_write_time);
if (!NT_STATUS_IS_OK(status)) {
DBG_WARNING("get_static_share_mode_data failed: %s\n",
nt_errstr(status));
goto fail;
}
status = get_static_share_mode_data(static_share_mode_record,
id,
servicepath,
smb_fname,
old_write_time);
if (!NT_STATUS_IS_OK(status)) {
DBG_DEBUG("get_static_share_mode_data failed: %s\n",
nt_errstr(status));
TALLOC_FREE(static_share_mode_record);
goto fail;
}
done: