From d49f9f4be7d825153026b2f63101fd89baa40ceb Mon Sep 17 00:00:00 2001 From: Jones Syue Date: Fri, 2 Jun 2023 14:40:09 +0800 Subject: [PATCH] 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 Reviewed-by: Ralph Boehme Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Fri Jun 2 09:48:17 UTC 2023 on atb-devel-224 (cherry picked from commit 9c24f853a84e1435235ba58ffcaaeff7dd80f6aa) --- docs-xml/smbdotconf/locking/smb2leases.xml | 2 -- docs-xml/smbdotconf/tuning/aioreadsize.xml | 2 +- docs-xml/smbdotconf/tuning/aiowritesize.xml | 2 +- source3/smbd/smb2_read.c | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) 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 no. - Note that the write cache won't be used for file handles with a smb2 write lease. - oplocks 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 @@ 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. + reads. The only reasonable values for this parameter are 0 (no async I/O) and 1 (always do async I/O). aio write size 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 @@ 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. + writes. The only reasonable values for this parameter are 0 (no async I/O) and 1 (always do async I/O). Compared to this parameter has diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c index 4c6822f2c74..ff945302f54 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. -- 2.47.3