From: Greg Kroah-Hartman Date: Sat, 13 Jan 2024 08:46:48 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v4.19.305~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dbd68a99096fc1e45743b75b2b67ea0d8e42924;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: 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..4e8ea99dcad --- /dev/null +++ b/queue-6.1/cifs-fix-flushing-folio-regression-for-6.1-backport.patch @@ -0,0 +1,29 @@ +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() + +Suggested-by: David Howells +Reported-by: Salvatore Bonaccorso +Signed-off-by: Steve French +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) || (IS_ERR(folio))) + return 0; + + size = folio_size(folio); diff --git a/queue-6.1/series b/queue-6.1/series index 22373318a05..f5510b25dee 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -1 +1,2 @@ +cifs-fix-flushing-folio-regression-for-6.1-backport.patch ipv6-remove-max_size-check-inline-with-ipv4.patch