6.1-stable patches

added patches:
	cifs-fix-noisy-message-on-copy_file_range.patch

diff --git a/queue-6.1/cifs-fix-noisy-message-on-copy_file_range.patch b/queue-6.1/cifs-fix-noisy-message-on-copy_file_range.patch
new file mode 100644 (file)
index 0000000..f87b750
--- /dev/null
+++ b/queue-6.1/cifs-fix-noisy-message-on-copy_file_range.patch
@@ -0,0 +1,36 @@
+From ae4ccca47195332c69176b8615c5ee17efd30c46 Mon Sep 17 00:00:00 2001
+From: Steve French <stfrench@microsoft.com>
+Date: Wed, 17 Jul 2024 00:42:22 -0500
+Subject: cifs: fix noisy message on copy_file_range
+
+From: Steve French <stfrench@microsoft.com>
+
+commit ae4ccca47195332c69176b8615c5ee17efd30c46 upstream.
+
+There are common cases where copy_file_range can noisily
+log "source and target of copy not on same server"
+e.g. the mv command across mounts to two different server's shares.
+Change this to informational rather than logging as an error.
+
+A followon patch will add dynamic trace points e.g. for
+cifs_file_copychunk_range
+
+Cc: stable@vger.kernel.org
+Reviewed-by: Shyam Prasad N <sprasad@microsoft.com>
+Signed-off-by: Steve French <stfrench@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/smb/client/cifsfs.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/smb/client/cifsfs.c
++++ b/fs/smb/client/cifsfs.c
+@@ -1397,7 +1397,7 @@ ssize_t cifs_file_copychunk_range(unsign
+       target_tcon = tlink_tcon(smb_file_target->tlink);
+ 
+       if (src_tcon->ses != target_tcon->ses) {
+-              cifs_dbg(VFS, "source and target of copy not on same server\n");
++              cifs_dbg(FYI, "source and target of copy not on same server\n");
+               goto out;
+       }
+ 

diff --git a/queue-6.1/series b/queue-6.1/series
index 7ddab3b4d037c24f3970a2f2a4e89852b02b87b5..001c03ea4b6042ccedfa3f89e75d5e8e974550f4 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -87,3 +87,4 @@ ksmbd-return-file_device_disk-instead-of-super-magic.patch
 selftests-vdso-fix-clang-build-errors-and-warnings.patch
 hfsplus-fix-uninit-value-in-copy_name.patch
 spi-mux-set-ctlr-bits_per_word_mask.patch
+cifs-fix-noisy-message-on-copy_file_range.patch