diff options
author | Volker Lendecke <vl@samba.org> | 2016-07-20 12:32:58 +0200 |
---|---|---|
committer | Ralph Boehme <slow@samba.org> | 2016-07-22 10:32:22 +0200 |
commit | dd10c820aab1c04f079c0d0f41dc176fdd5545c4 (patch) | |
tree | 2e2b073175c69c271adfa73159993d8c2333666c | |
parent | 5e333b5a4e2577f4e90a70a8d73ba67b194056e0 (diff) | |
download | samba-dd10c820aab1c04f079c0d0f41dc176fdd5545c4.tar.gz |
smbd: Enable leases by default
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r-- | docs-xml/smbdotconf/locking/smb2leases.xml | 8 | ||||
-rw-r--r-- | lib/param/loadparm.c | 2 | ||||
-rwxr-xr-x | selftest/target/Samba3.pm | 1 | ||||
-rwxr-xr-x | selftest/target/Samba4.pm | 1 | ||||
-rw-r--r-- | source3/param/loadparm.c | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/docs-xml/smbdotconf/locking/smb2leases.xml b/docs-xml/smbdotconf/locking/smb2leases.xml index 5ca13d2aa90..65873001ed8 100644 --- a/docs-xml/smbdotconf/locking/smb2leases.xml +++ b/docs-xml/smbdotconf/locking/smb2leases.xml @@ -7,8 +7,7 @@ This boolean option tells <command moreinfo="none">smbd</command> whether to globally negotiate SMB2 leases on file open requests. Leasing is an SMB2-only feature which allows clients to aggressively cache files locally above and - beyond the caching allowed by SMB1 oplocks. This (experimental) parameter is - set to off by default until the SMB2 leasing code is declared fully stable. + beyond the caching allowed by SMB1 oplocks. </para> <para> @@ -18,14 +17,11 @@ <para>Note that the write cache won't be used for file handles with a smb2 write lease.</para> - <para> - The Samba implementation of leases is currently marked as experimental! - </para> </description> <related>oplocks</related> <related>kernel oplocks</related> <related>level2 oplocks</related> <related>write cache size</related> -<value type="default">no</value> +<value type="default">yes</value> </samba:parameter> diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 515ed05e8d3..548d1055a31 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -2898,6 +2898,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lpcfg_do_global_parameter(lp_ctx, "aio max threads", "100"); + lpcfg_do_global_parameter(lp_ctx, "smb2 leases", "yes"); + /* Allow modules to adjust defaults */ for (defaults_hook = defaults_hooks; defaults_hook; defaults_hook = defaults_hook->next) { diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index f5f4c0c3e01..b5ea469184f 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1411,7 +1411,6 @@ sub provision($$$$$$$$) kernel oplocks = no kernel change notify = no - smb2 leases = yes logging = file printing = bsd diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index b09bb662515..9d96c166d2b 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -1652,6 +1652,7 @@ sub provision_ad_dc($$) kernel oplocks = no kernel change notify = no + smb2 leases = no logging = file printing = bsd diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index df700bcb763..71e9e2ec14c 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -862,7 +862,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) Globals.smb2_max_write = DEFAULT_SMB2_MAX_WRITE; Globals.smb2_max_trans = DEFAULT_SMB2_MAX_TRANSACT; Globals.smb2_max_credits = DEFAULT_SMB2_MAX_CREDITS; - Globals.smb2_leases = false; + Globals.smb2_leases = true; lpcfg_string_set(Globals.ctx, &Globals.ncalrpc_dir, get_dyn_NCALRPCDIR()); |