From: Jeremy Allison Date: Tue, 18 Jul 2006 01:29:55 +0000 (+0000) Subject: Make the default timeout parameter for lock waiting X-Git-Tag: samba-3.3.0pre1~1748 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58418d2470b08b10da63e962cd223e1c873d8893;p=thirdparty%2Fsamba.git Make the default timeout parameter for lock waiting be lp_lock_spin(). lock spin count is no longer used. Jeremy. --- diff --git a/docs/smbdotconf/locking/lockspincount.xml b/docs/smbdotconf/locking/lockspincount.xml index 92fee8806eb..9d74bd75300 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"> - 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. + This parameter has been made inoperative in Samba 3.0.24. + The functionality it contolled is now controlled by the parameter + . -3 +0 diff --git a/docs/smbdotconf/locking/lockspintime.xml b/docs/smbdotconf/locking/lockspintime.xml index c2e5501f070..da84d9379b8 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"> The time in microseconds that smbd should - pause before attempting to gain a failed lock. See - for more details. + 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 + parameter is + no longer used in Samba 3.0.24. You should not need + to change the value of this parameter. -10 +200