The branch, master has been updated
via 9c24f853a84 smbd: remove comments about deprecated 'write cache
size'
from f30f5793ad5 libsmb: Fix directory listing against old servers
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9c24f853a84e1435235ba58ffcaaeff7dd80f6aa
Author: Jones Syue <joness...@qnap.com>
Date: Fri Jun 2 14:40:09 2023 +0800
smbd: remove comments about deprecated 'write cache size'
The option 'write cache size' was removed since samba-4.12 version:
https://wiki.samba.org/index.php/Samba_4.12_Features_added/changed
https://git.samba.org/?p=samba.git;a=commit;h=3fea05e0
https://git.samba.org/?p=samba.git;a=commit;h=728fabea
It is supposed to remove comments about deprecated 'write cache size',
in order to avoid confusion when reading source code and documents.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15383
Signed-off-by: Jones Syue <joness...@qnap.com>
Reviewed-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Volker Lendecke <v...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Fri Jun 2 09:48:17 UTC 2023 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/locking/smb2leases.xml | 2 --
docs-xml/smbdotconf/tuning/aioreadsize.xml | 2 +-
docs-xml/smbdotconf/tuning/aiowritesize.xml | 2 +-
libgpo/admx/en-US/samba.adml | 15 +++++++--------
source3/smbd/smb2_read.c | 1 -
5 files changed, 9 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/locking/smb2leases.xml
b/docs-xml/smbdotconf/locking/smb2leases.xml
index 5a490875af7..89ff307d8f9 100644
--- a/docs-xml/smbdotconf/locking/smb2leases.xml
+++ b/docs-xml/smbdotconf/locking/smb2leases.xml
@@ -15,8 +15,6 @@
and <smbconfoption name="kernel oplocks">no</smbconfoption>.
</para>
- <para>Note that the write cache won't be used for file handles with a
smb2 write lease.</para>
-
</description>
<related>oplocks</related>
diff --git a/docs-xml/smbdotconf/tuning/aioreadsize.xml
b/docs-xml/smbdotconf/tuning/aioreadsize.xml
index 71120a80388..5218f34a6d6 100644
--- a/docs-xml/smbdotconf/tuning/aioreadsize.xml
+++ b/docs-xml/smbdotconf/tuning/aioreadsize.xml
@@ -6,7 +6,7 @@
<para>If this integer parameter is set to a non-zero value,
Samba will read from files asynchronously when the request size is bigger
than this value. Note that it happens only for non-chained and non-chaining
- reads and when not using write cache.</para>
+ reads.</para>
<para>The only reasonable values for this parameter are 0 (no async I/O) and
1 (always do async I/O).</para>
<related>aio write size</related>
diff --git a/docs-xml/smbdotconf/tuning/aiowritesize.xml
b/docs-xml/smbdotconf/tuning/aiowritesize.xml
index cdc079d13dc..029e1d135c0 100644
--- a/docs-xml/smbdotconf/tuning/aiowritesize.xml
+++ b/docs-xml/smbdotconf/tuning/aiowritesize.xml
@@ -6,7 +6,7 @@
<para>If this integer parameter is set to a non-zero value,
Samba will write to files asynchronously when the request size is bigger
than this value. Note that it happens only for non-chained and non-chaining
- reads and when not using write cache.</para>
+ writes.</para>
<para>The only reasonable values for this parameter are 0 (no async I/O) and
1 (always do async I/O).</para>
<para>Compared to <smbconfoption name="aio read size"/> this parameter has
diff --git a/libgpo/admx/en-US/samba.adml b/libgpo/admx/en-US/samba.adml
index 2b1b520ca62..c073758b004 100755
--- a/libgpo/admx/en-US/samba.adml
+++ b/libgpo/admx/en-US/samba.adml
@@ -323,14 +323,13 @@ Example: 4194304</string>
<string id="POL_B3B2B9CC_3DBC_5C45_AA31_7C1E52AFEFAF_Help">The time in
milliseconds that smbd should 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.</string>
<string id="POL_4A0366F2_6815_5654_8DC2_F68E840E53F4">oplock break wait
time</string>
<string id="POL_4A0366F2_6815_5654_8DC2_F68E840E53F4_Help">This is a
tuning parameter added due to bugs in both Windows 9x and WinNT. If Samba
responds to a client too quickly when that client issues an SMB that can cause
an oplock break request, then the network client can fail and not respond to
the break request. This tuning parameter (which is set in milliseconds) is the
amount of time Samba will wait before sending an oplock break request to such
(broken) clients.
- DO NOT CHANGE THIS PARAMETER UNLESS YOU HAVE READ AND UNDERSTOOD THE SAMBA
OPLOCK CODE.</string>
- <string id="POL_B49FAE41_B4C1_5AFA_870E_9E1C35F9A96F">smb2
leases</string>
- <string id="POL_B49FAE41_B4C1_5AFA_870E_9E1C35F9A96F_Help">This boolean
option tells smbd whether to globally negotiate SMB2 leases on file open
requests. Leasing is an SMB2-only feature which allows clients to aggressively
cache files locally above and beyond the caching allowed by SMB1 oplocks.
- This is only available with yes and no.
- Note that the write cache won't be used for file handles with a smb2 write
lease.</string>
- <string id="POL_1E9B5BE6_8C81_5141_88CD_B5AC0E8D964B">debug
class</string>
- <string id="POL_1E9B5BE6_8C81_5141_88CD_B5AC0E8D964B_Help">With this
boolean parameter enabled, the debug class (DBGC_CLASS)
- will be displayed in the debug header.
+ DO NOT CHANGE THIS PARAMETER UNLESS YOU HAVE READ AND UNDERSTOOD THE SAMBA
OPLOCK CODE.</string>
+ <string id="POL_B49FAE41_B4C1_5AFA_870E_9E1C35F9A96F">smb2
leases</string>
+ <string id="POL_B49FAE41_B4C1_5AFA_870E_9E1C35F9A96F_Help">This boolean
option tells smbd whether to globally negotiate SMB2 leases on file open
requests. Leasing is an SMB2-only feature which allows clients to aggressively
cache files locally above and beyond the caching allowed by SMB1 oplocks.
+ This is only available with yes and no.</string>
+ <string id="POL_1E9B5BE6_8C81_5141_88CD_B5AC0E8D964B">debug
class</string>
+ <string id="POL_1E9B5BE6_8C81_5141_88CD_B5AC0E8D964B_Help">With this
boolean parameter enabled, the debug class (DBGC_CLASS)
+ will be displayed in the debug header.
For more information about currently available debug classes, see
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index eb12dbd7269..0101c42cf76 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -353,7 +353,6 @@ static NTSTATUS schedule_smb2_sendfile_read(struct
smbd_smb2_request *smb2req,
* Signing is active OR
* This is a compound SMB2 operation OR
* fsp is a STREAM file OR
- * We're using a write cache OR
* It's not a regular file OR
* Requested offset is greater than file size OR
* there's not enough data in the file.
--
Samba Shared Repository
