summaryrefslogtreecommitdiff
path: root/docs/smbdotconf/locking
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-07-18 01:29:55 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:47:21 -0500
commit5da701f44d80cfe95aab3f736261c402b494a238 (patch)
tree4161655509ced64756f9cc34868e0618ce66ec46 /docs/smbdotconf/locking
parent2a67e3e88f94813bc710968ef177ed78d304f5ef (diff)
downloadsamba-5da701f44d80cfe95aab3f736261c402b494a238.tar.gz
samba-5da701f44d80cfe95aab3f736261c402b494a238.tar.bz2
samba-5da701f44d80cfe95aab3f736261c402b494a238.zip
Make the default timeout parameter for lock waiting
be lp_lock_spin(). lock spin count is no longer used. Jeremy. (This used to be commit 58418d2470b08b10da63e962cd223e1c873d8893)
Diffstat (limited to 'docs/smbdotconf/locking')
-rw-r--r--docs/smbdotconf/locking/lockspincount.xml13
-rw-r--r--docs/smbdotconf/locking/lockspintime.xml10
2 files changed, 11 insertions, 12 deletions
diff --git a/docs/smbdotconf/locking/lockspincount.xml b/docs/smbdotconf/locking/lockspincount.xml
index 92fee8806e..9d74bd7530 100644
--- a/docs/smbdotconf/locking/lockspincount.xml
+++ b/docs/smbdotconf/locking/lockspincount.xml
@@ -3,15 +3,10 @@
type="integer"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This parameter controls the number of times
- that smbd should attempt to gain a byte range lock on the
- behalf of a client request. Experiments have shown that
- Windows 2k servers do not reply with a failure if the lock
- could not be immediately granted, but try a few more times
- in case the lock could later be acquired. This behavior
- is used to support PC database formats such as MS Access
- and FoxPro.
+ <para>This parameter has been made inoperative in Samba 3.0.24.
+ The functionality it contolled is now controlled by the parameter
+ <smbconfoption name="lock spin time"/>.
</para>
</description>
-<value type="default">3</value>
+<value type="default">0</value>
</samba:parameter>
diff --git a/docs/smbdotconf/locking/lockspintime.xml b/docs/smbdotconf/locking/lockspintime.xml
index c2e5501f07..da84d9379b 100644
--- a/docs/smbdotconf/locking/lockspintime.xml
+++ b/docs/smbdotconf/locking/lockspintime.xml
@@ -4,8 +4,12 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>The time in microseconds that smbd should
- pause before attempting to gain a failed lock. See
- <smbconfoption name="lock spin count"/> for more details.</para>
+ keep waiting to see if a failed lock request can
+ be granted. This parameter has changed in default
+ value from Samba 3.0.23 from 10 to 200. The associated
+ <smbconfoption name="lock spin count"/> parameter is
+ no longer used in Samba 3.0.24. You should not need
+ to change the value of this parameter.</para>
</description>
-<value type="default">10</value>
+<value type="default">200</value>
</samba:parameter>