summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-03-28 08:11:01 +0200
committerStefan Metzmacher <metze@samba.org>2011-03-28 09:00:09 +0200
commitdc36d75d5fddaa351025e8eb8140f401b66aeb9d (patch)
treef0e0a6920d223c56dfbf2a2073a2031a47fe49a8
parenta414356075ab28259fe4fe534478bc43aa3ce6d9 (diff)
downloadsamba-dc36d75d5fddaa351025e8eb8140f401b66aeb9d.tar.gz
samba-dc36d75d5fddaa351025e8eb8140f401b66aeb9d.tar.bz2
samba-dc36d75d5fddaa351025e8eb8140f401b66aeb9d.zip
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@samba.org> Autobuild-Date: Mon Mar 28 09:00:09 CEST 2011 on sn-devel-104
-rw-r--r--docs-xml/smbdotconf/tuning/strictallocate.xml11
-rw-r--r--source3/param/loadparm.c2
2 files changed, 6 insertions, 7 deletions
diff --git a/docs-xml/smbdotconf/tuning/strictallocate.xml b/docs-xml/smbdotconf/tuning/strictallocate.xml
index 9311eb6b80..1855574776 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 ba3cd3c6c5..49b9248ca6 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 */