mm/filemap: use filemap_end_dropbehind() for read invalidation

Use the filemap_end_dropbehind() helper rather than calling
folio_unmap_invalidate() directly, as we need to check if the folio has
been redirtied or marked for writeback once the folio lock has been
re-acquired.

Cc: stable@vger.kernel.org
Reported-by: Trond Myklebust <trondmy@hammerspace.com>
Fixes: 8026e49bff9b ("mm/filemap: add read support for RWF_DONTCACHE")
Link: https://lore.kernel.org/linux-fsdevel/ba8a9805331ce258a622feaca266b163db681a10.camel@hammerspace.com/
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/mm/filemap.c b/mm/filemap.c
index 008a55290f34a90fdbc35588ad628336a1e5db93..6af6d8f2929ce4de55f490eba0bc0db234162e75 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2644,8 +2644,7 @@ static inline bool pos_same_folio(loff_t pos1, loff_t pos2, struct folio *folio)
        return (pos1 >> shift == pos2 >> shift);
 }
 
-static void filemap_end_dropbehind_read(struct address_space *mapping,
-                                       struct folio *folio)
+static void filemap_end_dropbehind_read(struct folio *folio)
 {
        if (!folio_test_dropbehind(folio))
                return;
@@ -2653,7 +2652,7 @@ static void filemap_end_dropbehind_read(struct address_space *mapping,
                return;
        if (folio_trylock(folio)) {
                if (folio_test_clear_dropbehind(folio))
-                       folio_unmap_invalidate(mapping, folio, 0);
+                       filemap_end_dropbehind(folio);
                folio_unlock(folio);
        }
 }
@@ -2774,7 +2773,7 @@ put_folios:
                for (i = 0; i < folio_batch_count(&fbatch); i++) {
                        struct folio *folio = fbatch.folios[i];
 
-                       filemap_end_dropbehind_read(mapping, folio);
+                       filemap_end_dropbehind_read(folio);
                        folio_put(folio);
                }
                folio_batch_init(&fbatch);