From c26843957feb4693565c252ea3fd8213513400ae Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 13 Jan 2024 21:39:24 +0100 Subject: [PATCH] 6.1-stable patches added patches: cifs-fix-flushing-folio-regression-for-6.1-backport.patch --- ...ng-folio-regression-for-6.1-backport.patch | 32 +++++++++++++++++++ queue-6.1/series | 1 + 2 files changed, 33 insertions(+) create mode 100644 queue-6.1/cifs-fix-flushing-folio-regression-for-6.1-backport.patch diff --git a/queue-6.1/cifs-fix-flushing-folio-regression-for-6.1-backport.patch b/queue-6.1/cifs-fix-flushing-folio-regression-for-6.1-backport.patch new file mode 100644 index 00000000000..4211ac10a62 --- /dev/null +++ b/queue-6.1/cifs-fix-flushing-folio-regression-for-6.1-backport.patch @@ -0,0 +1,32 @@ +From ba288a873fb8ac3d1bf5563366558a905620c071 Mon Sep 17 00:00:00 2001 +From: Steve French +Date: Fri, 12 Jan 2024 23:08:51 -0600 +Subject: cifs: fix flushing folio regression for 6.1 backport + +filemap_get_folio works differenty in 6.1 vs. later kernels +(returning NULL in 6.1 instead of an error). Add +this minor correction which addresses the regression in the patch: + cifs: Fix flushing, invalidation and file size with copy_file_range() + +Link: https://lore.kernel.org/all/a76b370f93cb928c049b94e1fde0d2da506dfcb2.camel@amazon.com/ +Reported-by: "Jitindar Singh, Suraj" +Suggested-by: David Howells +Reported-by: Salvatore Bonaccorso +Signed-off-by: Steve French +Tested-by: Salvatore Bonaccorso +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -1240,7 +1240,7 @@ static int cifs_flush_folio(struct inode + int rc = 0; + + folio = filemap_get_folio(inode->i_mapping, index); +- if (IS_ERR(folio)) ++ if (!folio) + return 0; + + size = folio_size(folio); diff --git a/queue-6.1/series b/queue-6.1/series index d489b1832e5..09d1e670778 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -1,3 +1,4 @@ revert-nfsd-call-nfsd_last_thread-before-final-nfsd_put.patch revert-nfsd-separate-nfsd_last_thread-from-nfsd_put.patch ipv6-remove-max_size-check-inline-with-ipv4.patch +cifs-fix-flushing-folio-regression-for-6.1-backport.patch -- 2.47.3