summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-12-15 13:32:09 -0800
committerJeremy Allison <jra@samba.org>2010-12-15 14:09:48 -0800
commitecf48af135e4c1ebc5aafe4b3dad785162f5949a (patch)
treeff35851422bfe2959003c09a53bd008e5629c965
parent6bb89aaa0d38d59ce4f0d9362822ba1c525eb203 (diff)
downloadsamba-ecf48af135e4c1ebc5aafe4b3dad785162f5949a.tar.gz
samba-ecf48af135e4c1ebc5aafe4b3dad785162f5949a.tar.bz2
samba-ecf48af135e4c1ebc5aafe4b3dad785162f5949a.zip
Change strict allocate to default to true. (cherry picked from commit 820ea22a07b062b1717d35de8fa7051fc1067c3f)
-rw-r--r--docs-xml/smbdotconf/tuning/strictallocate.xml11
-rw-r--r--source3/param/loadparm.c2
2 files changed, 7 insertions, 6 deletions
diff --git a/docs-xml/smbdotconf/tuning/strictallocate.xml b/docs-xml/smbdotconf/tuning/strictallocate.xml
index 1855574776..9311eb6b80 100644
--- 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 ced8223833..2f68f00c78 100644
--- 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 */