Change strict allocate to default to true. (cherry picked from commit 820ea22a07b062b...

diff --git a/docs-xml/smbdotconf/tuning/strictallocate.xml b/docs-xml/smbdotconf/tuning/strictallocate.xml
index 18555747767943a2312d8e8b963e2f367ccc43bc..9311eb6b8076210fcd473fffae0da297316c9db2 100644 (file)
--- a/docs-xml/smbdotconf/tuning/strictallocate.xml
+++ b/docs-xml/smbdotconf/tuning/strictallocate.xml
@@ -10,9 +10,10 @@
     of actually forcing the disk system to allocate real storage blocks
     when a file is created or extended to be a given size. In UNIX
     terminology this means that Samba will stop creating sparse files.
-    This can be slow on some systems. When you work with large files like
-    >100MB or so you may even run into problems with clients running into
-    timeouts.</para>
+    Modern UNIX filesystems now support extents and so in Samba 3.6.0 we
+    have changed this parameter to default to "yes". On older filesystems
+    without extents you might want to turn this parameter to "no".
+    </para>
 
     <para>When you have an extent based filesystem it's likely that we can make
     use of unwritten extents which allows Samba to allocate even large amounts
@@ -28,9 +29,9 @@
     preallocation is probably an expensive operation where you will see reduced
     performance and risk to let clients run into timeouts when creating large
     files. Examples are ext3, ZFS, HFS+ and most others, so be aware if you
-    activate this setting on those filesystems.</para>
+    leave the default setting on those filesystems.</para>
 
 </description>
 
-<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 ced8223833724537e5537835ee80c8f32b46130e..2f68f00c78bae1c02e61cbf8a16fc701a63a9815 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -633,7 +633,7 @@ static struct service sDefault = {
        false,                  /* bWidelinks */
        True,                   /* bSymlinks */
        False,                  /* bSyncAlways */
-       False,                  /* bStrictAllocate */
+       True,                   /* bStrictAllocate */
        False,                  /* bStrictSync */
        '~',                    /* magic char */
        NULL,                   /* copymap */