[PATCH] Removed unused 'oplock contention limit' config parameter

[Christof Schmitt]

It looks like this parameter has not been used for a long time.

Christof
-------------- next part --------------
From 4cded3613449787054b2abe1d0c8dd5cc3b906eb Mon Sep 17 00:00:00 2001
From: Christof Schmitt <cs at samba.org>
Date: Tue, 17 Oct 2017 14:49:17 -0700
Subject: [PATCH] Removed unused 'oplock contention limit' config parameter

Signed-off-by: Christof Schmitt <cs at samba.org>
---
 WHATSNEW.txt                                       |  1 +
 .../smbdotconf/locking/oplockcontentionlimit.xml   | 26 ----------------------
 source3/param/loadparm.c                           |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 docs-xml/smbdotconf/locking/oplockcontentionlimit.xml

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 2f2f2f6..cc03f20 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -40,6 +40,7 @@ smb.conf changes
 
   Parameter Name                     Description             Default
   --------------                     -----------             -------
+  oplock contention limit            Removed
 
 NT4-style replication based net commands removed
 ================================================
diff --git a/docs-xml/smbdotconf/locking/oplockcontentionlimit.xml b/docs-xml/smbdotconf/locking/oplockcontentionlimit.xml
deleted file mode 100644
index edaa7d7..0000000
--- a/docs-xml/smbdotconf/locking/oplockcontentionlimit.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<samba:parameter name="oplock contention limit"
-                 context="S"
-                 type="integer"
-                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
-	<para>
-	This is a <emphasis>very</emphasis> advanced <citerefentry><refentrytitle>smbd</refentrytitle>
-	<manvolnum>8</manvolnum></citerefentry> tuning option to improve the efficiency of the 
-	granting of oplocks under multiple client contention for the same file.
-	</para>
-		
-	<para>
-	In brief it specifies a number, which causes <citerefentry><refentrytitle>smbd</refentrytitle>
-	<manvolnum>8</manvolnum></citerefentry>not to grant an oplock even when requested if the 
-	approximate number of clients contending for an oplock on the same file goes over this 
-	limit. This causes <command moreinfo="none">smbd</command> to behave in a similar 
-	way to Windows NT.
-	</para>
-
-	<warning><para>
-	DO NOT CHANGE THIS PARAMETER UNLESS YOU HAVE READ AND UNDERSTOOD THE SAMBA OPLOCK CODE.
-	</para></warning>
-
-</description>
-<value type="default">2</value>
-</samba:parameter>
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 42e579e..02c3eb6 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -168,7 +168,6 @@ static struct loadparm_service sDefault =
 	.max_connections = 0,
 	.default_case = CASE_LOWER,
 	.printing = DEFAULT_PRINTING,
-	.oplock_contention_limit = 2,
 	.csc_policy = 0,
 	.block_size = 1024,
 	.dfree_cache_time = 0,
-- 
1.8.3.1