summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs-xml/smbdotconf/locking/kerneloplocks.xml7
-rw-r--r--source3/param/loadparm.c2
2 files changed, 4 insertions, 5 deletions
diff --git a/docs-xml/smbdotconf/locking/kerneloplocks.xml b/docs-xml/smbdotconf/locking/kerneloplocks.xml
index 9ac7256fb9..8e3bba5122 100644
--- 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 2fa70db1c9..dbf47c0320 100644
--- 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,