[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  dc36d75 Revert "Change strict allocate to default to true.
      from  a414356 s3: Fix Coverity ID 2188: MISSING_BREAK

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit dc36d75d5fddaa351025e8eb8140f401b66aeb9d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Mar 28 08:11:01 2011 +0200

    Revert "Change strict allocate to default to true.
    
    This reverts commit ecf48af135e4c1ebc5aafe4b3dad785162f5949a.
    
    This makes Samba unusable on systems without Linux and
    a modern Filesystem.
    
    This was discussed with Jeremy on IRC:
    http://irclog.samba.org/2011/01/20110126-Wed.log
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Mar 28 09:00:09 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/tuning/strictallocate.xml |   11 +++++------
 source3/param/loadparm.c                      |    2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/tuning/strictallocate.xml b/docs-xml/smbdotconf/tuning/strictallocate.xml
index 9311eb6..1855574 100644
--- a/docs-xml/smbdotconf/tuning/strictallocate.xml
+++ b/docs-xml/smbdotconf/tuning/strictallocate.xml
@@ -10,10 +10,9 @@
     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.
-    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>
+    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>
 
     <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
@@ -29,9 +28,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
-    leave the default setting on those filesystems.</para>
+    activate this setting on those filesystems.</para>
 
 </description>
 
-<value type="default">yes</value>
+<value type="default">no</value>
 </samba:parameter>
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index ba3cd3c..49b9248 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -636,7 +636,7 @@ static struct service sDefault = {
 	false,			/* bWidelinks */
 	True,			/* bSymlinks */
 	False,			/* bSyncAlways */
-	True,			/* bStrictAllocate */
+	False,			/* bStrictAllocate */
 	False,			/* bStrictSync */
 	'~',			/* magic char */
 	NULL,			/* copymap */


-- 
Samba Shared Repository