s3: switch off kernel oplocks by default

as discussed on samba-technical, turn kernel oplocks off by default
to not leave users without the benefits of Level II oplocks

diff --git a/docs-xml/smbdotconf/locking/kerneloplocks.xml b/docs-xml/smbdotconf/locking/kerneloplocks.xml
index 9ac7256fb9f7592099be4af5947f134540f20f60..8e3bba512268cd9b98954de3b97e90f1d533143f 100644 (file)
--- a/docs-xml/smbdotconf/locking/kerneloplocks.xml
+++ b/docs-xml/smbdotconf/locking/kerneloplocks.xml
@@ -19,12 +19,11 @@
        parameter on Linux and IRIX to get Level II oplocks and the associated
        performance benefit.</para>
 
-       <para>This parameter defaults to <constant>on</constant>, but is translated
-       to a no-op on systems that no not have the necessary kernel support.
-       You should never need to touch this parameter.</para>
+       <para>This parameter defaults to <constant>no</constant> and is translated
+       to a no-op on systems that do not have the necessary kernel support.</para>
 </description>
 
 <related>oplocks</related>
 <related>level2 oplocks</related>
-<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 2fa70db1c9dfb4e618d3e0b14afd505d109523f6..dbf47c0320d503916ffacaa077fb56cec05bbd86 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -230,7 +230,7 @@ static struct loadparm_service sDefault =
        .bPosixLocking = true,
        .bShareModes = true,
        .bOpLocks = true,
-       .bKernelOplocks = true,
+       .bKernelOplocks = false,
        .bLevel2OpLocks = true,
        .bOnlyUser = false,
        .bMangledNames = true,