Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / mm / folio-compat.c

diff --git a/mm/folio-compat.c b/mm/folio-compat.c
index cabcd1de9ecbb206ad7f95e3744c4b2dabf5e92b..c6f056c2050340fb77f62c7b486ab0d86dc529ce 100644 (file)
--- a/mm/folio-compat.c
+++ b/mm/folio-compat.c
@@ -97,8 +97,8 @@ struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index,
        struct folio *folio;
 
        folio = __filemap_get_folio(mapping, index, fgp_flags, gfp);
-       if (!folio || xa_is_value(folio))
-               return &folio->page;
+       if (IS_ERR(folio))
+               return NULL;
        return folio_file_page(folio, index);
 }
 EXPORT_SYMBOL(pagecache_get_page);
@@ -106,9 +106,7 @@ EXPORT_SYMBOL(pagecache_get_page);
 struct page *grab_cache_page_write_begin(struct address_space *mapping,
                                        pgoff_t index)
 {
-       unsigned fgp_flags = FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE;
-
-       return pagecache_get_page(mapping, index, fgp_flags,
+       return pagecache_get_page(mapping, index, FGP_WRITEBEGIN,
                        mapping_gfp_mask(mapping));
 }
 EXPORT_SYMBOL(grab_cache_page_write_begin);