]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
cifs: fix flushing folio regression for 6.1 backport
authorSteve French <stfrench@microsoft.com>
Sat, 13 Jan 2024 05:08:51 +0000 (23:08 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jan 2024 17:54:51 +0000 (18:54 +0100)
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" <surajjs@amazon.com>
Suggested-by: David Howells <dhowells@redhat.com>
Reported-by: Salvatore Bonaccorso <carnil@debian.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Tested-by: Salvatore Bonaccorso <carnil@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/smb/client/cifsfs.c

index 2e15b182e59fca929094a6f1bcf9cc57ac161116..7286a56aebfa9d59b16dc6de0333e4f92756f56d 100644 (file)
@@ -1240,7 +1240,7 @@ static int cifs_flush_folio(struct inode *inode, loff_t pos, loff_t *_fstart, lo
        int rc = 0;
 
        folio = filemap_get_folio(inode->i_mapping, index);
-       if (IS_ERR(folio))
+       if (!folio)
                return 0;
 
        size = folio_size(folio);