[PATCH] smbd: Enable leases by default
Jeremy Allison
jra at samba.org
Wed Jul 20 15:52:47 UTC 2016
On Wed, Jul 20, 2016 at 12:39:13PM +0200, Volker Lendecke wrote:
> Hi!
>
> Is it time for this?
+1 from me. Let's get this done before 4.5.0 !
Reviewed-by: Jeremy Allison <jra at samba.org>
> From 475f16ffcea79130468f7cfd89c8a80c662548d2 Mon Sep 17 00:00:00 2001
> From: Volker Lendecke <vl at samba.org>
> Date: Wed, 20 Jul 2016 12:32:58 +0200
> Subject: [PATCH] smbd: Enable leases by default
>
> Signed-off-by: Volker Lendecke <vl at samba.org>
> ---
> docs-xml/smbdotconf/locking/smb2leases.xml | 8 ++------
> source3/param/loadparm.c | 2 +-
> 2 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/docs-xml/smbdotconf/locking/smb2leases.xml b/docs-xml/smbdotconf/locking/smb2leases.xml
> index 5ca13d2..6587300 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/source3/param/loadparm.c b/source3/param/loadparm.c
> index df700bc..71e9e2e 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());
> --
> 2.1.4
>
More information about the samba-technical
mailing list