[SCM] Samba Shared Repository - branch master updated
Björn Jacke
bjacke at samba.org
Sun Jul 7 23:22:02 UTC 2019
The branch, master has been updated
via 0751047f559 docs-xml: deprecate allocation roundup size parameter
via d6b8cbc8f70 param: change default of "allocation roundup size" to 0
via 37b3c6375b4 torture: fix durable open/alloc-size test
from cd0df26bdc7 WHATSNEW: Add CTDB updates for 4.11
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0751047f559fb8b30d671bcbc4bc8481192db114
Author: Björn Jacke <bj at sernet.de>
Date: Wed Jun 19 13:20:34 2019 +0200
docs-xml: deprecate allocation roundup size parameter
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Christof Schmitt <cs at samba.org>
Autobuild-User(master): Björn Jacke <bjacke at samba.org>
Autobuild-Date(master): Sun Jul 7 23:21:55 UTC 2019 on sn-devel-184
commit d6b8cbc8f7078b1ee5574204f2cac18d20a206e6
Author: Björn Jacke <bj at sernet.de>
Date: Wed Jun 19 13:04:55 2019 +0200
param: change default of "allocation roundup size" to 0
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Christof Schmitt <cs at samba.org>
commit 37b3c6375b43cdbb5d06d194a88835c5637d66a0
Author: Björn Jacke <bj at sernet.de>
Date: Thu Jun 20 16:10:52 2019 +0200
torture: fix durable open/alloc-size test
Signed-off-by: Bjoern Jacke <bjacke at samba.org>
Reviewed-by: Christof Schmitt <cs at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/tuning/allocationroundupsize.xml | 18 +++++++++++++-----
lib/param/loadparm.c | 2 --
source3/include/local.h | 3 ---
source3/param/loadparm.c | 1 -
source4/torture/smb2/durable_open.c | 2 +-
5 files changed, 14 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/tuning/allocationroundupsize.xml b/docs-xml/smbdotconf/tuning/allocationroundupsize.xml
index eaea467bc39..08aa621fcc5 100644
--- a/docs-xml/smbdotconf/tuning/allocationroundupsize.xml
+++ b/docs-xml/smbdotconf/tuning/allocationroundupsize.xml
@@ -1,20 +1,28 @@
<samba:parameter name="allocation roundup size"
context="S"
type="bytes"
+ deprecated="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>This parameter allows an administrator to tune the
- allocation size reported to Windows clients. The default
- size of 1Mb generally results in improved Windows client
- performance. However, rounding the allocation size may cause
+ allocation size reported to Windows clients. This is only
+ useful for old SMB1 clients because modern SMB dialects
+ eliminated that bottleneck and have better performance by
+ default. Using this parameter may cause
difficulties for some applications, e.g. MS Visual Studio.
If the MS Visual Studio compiler starts to crash with an
internal error, set this parameter to zero for this share.
+ Settings this parameter to a large value can also cause
+ small files to allocate more space on the disk than
+ needed.
+ </para>
+ <para>This parameter is deprecated and will be removed in
+ one of the next Samba releases.
</para>
<para>The integer parameter specifies the roundup size in bytes.</para>
</description>
-<value type="default">1048576</value>
-<value type="example">0<comment>(to disable roundups)</comment></value>
+<value type="default">0</value>
+<value type="example">1048576<comment>(to set it to the former default of 1 MiB)</comment></value>
</samba:parameter>
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 413e0237800..239d671803f 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2889,8 +2889,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "show add printer wizard", "yes");
- lpcfg_do_global_parameter(lp_ctx, "allocation roundup size", "1048576");
-
lpcfg_do_global_parameter(lp_ctx, "ldap page size", "1000");
lpcfg_do_global_parameter(lp_ctx, "kernel share modes", "yes");
diff --git a/source3/include/local.h b/source3/include/local.h
index 62700aace3c..9ae1bcf5347 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -151,9 +151,6 @@
/* the maximum age in seconds of a password. Should be a lp_ parameter */
#define MAX_PASSWORD_AGE (21*24*60*60)
-/* Default allocation roundup. */
-#define SMB_ROUNDUP_ALLOCATION_SIZE 0x100000
-
/* shall we deny oplocks to clients that get timeouts? */
#define FASCIST_OPLOCK_BACKOFF 1
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5104a3408f1..c2e1f341c57 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -236,7 +236,6 @@ static const struct loadparm_service _sDefault =
.acl_map_full_control = true,
.acl_group_control = false,
.acl_allow_execute_always = false,
- .allocation_roundup_size = SMB_ROUNDUP_ALLOCATION_SIZE,
.aio_read_size = 1,
.aio_write_size = 1,
.map_readonly = MAP_READONLY_NO,
diff --git a/source4/torture/smb2/durable_open.c b/source4/torture/smb2/durable_open.c
index 229c39dce67..3d78a35d92c 100644
--- a/source4/torture/smb2/durable_open.c
+++ b/source4/torture/smb2/durable_open.c
@@ -2470,7 +2470,7 @@ static bool test_durable_open_alloc_size(struct torture_context *tctx,
bool ret = true;
uint64_t previous_session_id;
uint64_t alloc_size_step;
- uint64_t initial_alloc_size = 0x100;
+ uint64_t initial_alloc_size = 0x1000;
const uint8_t *b = NULL;
struct smbcli_options options;
--
Samba Shared Repository
More information about the samba-cvs
mailing list