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

param: rename lp function and variable from "syncalways" to "sync_always"

Browse Source 
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Garming Sam
2014-02-04 15:09:12 +13:00
committed by Jeremy Allison
parent 52b1b168b3
commit 61d4af550a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/param_functions.c
View File

@ -106,7 +106,7 @@ FN_LOCAL_BOOL(kernel_share_modes, kernel_share_modes)
FN_LOCAL_BOOL(only_user, only_user)
FN_LOCAL_PARM_BOOL(mangled_names, mangled_names)
FN_LOCAL_BOOL(follow_symlinks, follow_symlinks)
FN_LOCAL_BOOL(syncalways, syncalways)
FN_LOCAL_BOOL(sync_always, sync_always)
FN_LOCAL_BOOL(strict_allocate, strict_allocate)
FN_LOCAL_BOOL(delete_readonly, delete_readonly)
FN_LOCAL_BOOL(fake_oplocks, fake_oplocks)

2
lib/param/param_table.c
View File

@ -1875,7 +1875,7 @@ static struct parm_struct parm_table[] = {
.label = "sync always",
.type = P_BOOL,
.p_class = P_LOCAL,
.offset = LOCAL_VAR(syncalways),
.offset = LOCAL_VAR(sync_always),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED | FLAG_SHARE,

2
source3/param/loadparm.c
View File

@ -234,7 +234,7 @@ static struct loadparm_service sDefault =
.mangled_names = true,
.bWidelinks = false,
.follow_symlinks = true,
.syncalways = false,
.sync_always = false,
.strict_allocate = false,
.strict_sync = false,
.mangling_char = '~',

4
source3/smbd/aio.c
View File

@ -371,7 +371,7 @@ static void pwrite_fsync_write_done(struct tevent_req *subreq)
}
do_sync = (lp_strict_sync(SNUM(conn)) &&
(lp_syncalways(SNUM(conn)) || state->write_through));
(lp_sync_always(SNUM(conn)) || state->write_through));
if (!do_sync) {
tevent_req_done(req);
return;
@ -512,7 +512,7 @@ NTSTATUS schedule_aio_write_and_X(connection_struct *conn,
contend_level2_oplocks_begin(fsp, LEVEL2_CONTEND_WRITE);
contend_level2_oplocks_end(fsp, LEVEL2_CONTEND_WRITE);
if (!aio_ex->write_through && !lp_syncalways(SNUM(fsp->conn))
if (!aio_ex->write_through && !lp_sync_always(SNUM(fsp->conn))
&& fsp->aio_write_behind) {
/* Lie to the client and immediately claim we finished the
* write. */

2
source3/smbd/fileio.c
View File

@ -1026,7 +1026,7 @@ NTSTATUS sync_file(connection_struct *conn, files_struct *fsp, bool write_throug
return NT_STATUS_INVALID_HANDLE;
if (lp_strict_sync(SNUM(conn)) &&
(lp_syncalways(SNUM(conn)) || write_through)) {
(lp_sync_always(SNUM(conn)) || write_through)) {
int ret = flush_write_cache(fsp, SAMBA_SYNC_FLUSH);
if (ret == -1) {
return map_nt_error_from_unix(errno);