From 3c2c12fa2636599f5be276e6aafc54de037b3b59 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 13 Jan 2024 21:34:44 +0100 Subject: [PATCH] drop 6.1 cifs patch will add it back in a bit... --- ...ng-folio-regression-for-6.1-backport.patch | 30 ------------------- queue-6.1/series | 1 - 2 files changed, 31 deletions(-) delete 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 deleted file mode 100644 index 094442a8ce4..00000000000 --- a/queue-6.1/cifs-fix-flushing-folio-regression-for-6.1-backport.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 -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) || (IS_ERR(folio))) - return 0; - - size = folio_size(folio); diff --git a/queue-6.1/series b/queue-6.1/series index d8b7cec3887..d489b1832e5 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -1,4 +1,3 @@ -cifs-fix-flushing-folio-regression-for-6.1-backport.patch 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 -- 2.47.3