]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
ext4: Use folio_end_read()
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Tue, 18 Jul 2023 19:30:39 +0000 (15:30 -0400)
committerMatthew Wilcox (Oracle) <willy@infradead.org>
Wed, 4 Oct 2023 01:07:32 +0000 (21:07 -0400)
folio_end_read() is the perfect fit for ext4.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
fs/ext4/readpage.c

index 3e7d160f543f0cc6b5daddaec3f4785086c52c7a..21e8f0aebb3c6477c62dff8d80e606f23379b414 100644 (file)
@@ -70,15 +70,8 @@ static void __read_end_io(struct bio *bio)
 {
        struct folio_iter fi;
 
-       bio_for_each_folio_all(fi, bio) {
-               struct folio *folio = fi.folio;
-
-               if (bio->bi_status)
-                       folio_clear_uptodate(folio);
-               else
-                       folio_mark_uptodate(folio);
-               folio_unlock(folio);
-       }
+       bio_for_each_folio_all(fi, bio)
+               folio_end_read(fi.folio, bio->bi_status == 0);
        if (bio->bi_private)
                mempool_free(bio->bi_private, bio_post_read_ctx_pool);
        bio_put(bio);
@@ -336,8 +329,7 @@ int ext4_mpage_readpages(struct inode *inode,
                                if (ext4_need_verity(inode, folio->index) &&
                                    !fsverity_verify_folio(folio))
                                        goto set_error_page;
-                               folio_mark_uptodate(folio);
-                               folio_unlock(folio);
+                               folio_end_read(folio, true);
                                continue;
                        }
                } else if (fully_mapped) {