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)

diff --git a/docs/smbdotconf/locking/lockspincount.xml b/docs/smbdotconf/locking/lockspincount.xml
index 92fee8806eb27e2ab0dd1be4df085277e317c6e0..9d74bd75300147144e82a1a49ef11b7e3f79e5fe 100644 (file)
--- 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 c2e5501f070a1a4ba74eada4b20a627f524d3a9a..da84d9379b8170b204d2f1ec7cd1f443817a23ff 100644 (file)
--- 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>