- added docs on the new "fake oplocks" option.

(This used to be commit 1303132113b24a3e84dd76efe1c664e0dffe5013)

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 6761445b8949a1fcfd6e7d8aaa244894906ef6a1..7a1631bb3db9d4555cabcfb3b5888a40b581d55b 100644 (file)
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -472,6 +472,8 @@ dont descend
 
 exec
 
+fake oplocks
+
 force group
 
 force user
@@ -1569,6 +1571,31 @@ of the user.
 .B Example: 
        only user = True
 
+.SS fake oplocks (S)
+
+Oplocks are the way that SMB clients get permission from a server to
+locally cache file operations. If a server grants an oplock
+(opportunistic lock) then the client is free to assume that it is the
+only one accessing the file and it will agressively cache file
+data. With some oplock types the client may even cache file open/close
+operations. This can give enormous performance benefits.
+
+Samba does not support opportunistic locks because they are very
+difficult to do under Unix. Samba can fake them, however, by granting
+a oplock whenever a client asks for one. This is controlled using the
+smb.conf option "fake oplocks". If you set "fake oplocks = yes" then
+you are telling the client that it may agressively cache the file
+data.
+
+By enabling this option on all read-only shares or shares that you know
+will only be accessed from one client at a time you will see a big
+performance improvement on many operations. If you enable this option
+on shares where multiple clients may be accessing the files read-write
+at the same time you can get data corruption. Use this option
+carefully! 
+
+This option is disabled by default.
+
 .SS message command (G)
 
 This specifies what command to run when the server receives a WinPopup

diff --git a/docs/textdocs/Speed.txt b/docs/textdocs/Speed.txt
index 28bceb658f5c49d0d4ded1548984726c00fdf4e2..b62e408922cc5ca0a74e1885b3ab59a694b33141 100644 (file)
--- a/docs/textdocs/Speed.txt
+++ b/docs/textdocs/Speed.txt
@@ -30,6 +30,32 @@ hardware Samba should certainly be competitive in speed with other
 systems.
 
 
+OPLOCKS
+-------
+
+Oplocks are the way that SMB clients get permission from a server to
+locally cache file operations. If a server grants an oplock
+(opportunistic lock) then the client is free to assume that it is the
+only one accessing the file and it will agressively cache file
+data. With some oplock types the client may even cache file open/close
+operations. This can give enormous performance benefits.
+
+Samba does not support opportunistic locks because they are very
+difficult to do under Unix. Samba can fake them, however, by granting
+a oplock whenever a client asks for one. This is controlled using the
+smb.conf option "fake oplocks". If you set "fake oplocks = yes" then
+you are telling the client that it may agressively cache the file
+data.
+
+By enabling this option on all read-only shares or shares that you know
+will only be accessed from one client at a time you will see a big
+performance improvement on many operations. If you enable this option
+on shares where multiple clients may be accessing the files read-write
+at the same time you can get data corruption. Use this option
+carefully! 
+
+This option is disabled by default.
+
 SOCKET OPTIONS
 --------------