From d642afa7f16ba481ae89278ca00c01357c0b8c45 Mon Sep 17 00:00:00 2001 From: Christian Ambach Date: Mon, 16 Apr 2012 17:37:17 +0200 Subject: 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 --- docs-xml/smbdotconf/locking/kerneloplocks.xml | 7 +++---- source3/param/loadparm.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs-xml/smbdotconf/locking/kerneloplocks.xml b/docs-xml/smbdotconf/locking/kerneloplocks.xml index 9ac7256fb9f..8e3bba51226 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. - This parameter defaults to on, 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. + This parameter defaults to no and is translated + to a no-op on systems that do not have the necessary kernel support. oplocks level2 oplocks -yes +no diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 2fa70db1c9d..dbf47c0320d 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, -- cgit