]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ufs: Convert ufs_get_page() to use a folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Mon, 8 Jul 2024 16:11:21 +0000 (12:11 -0400)
committerChristian Brauner <brauner@kernel.org>
Wed, 7 Aug 2024 09:31:51 +0000 (11:31 +0200)
Remove a call to read_mapping_page().

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/ufs/dir.c

index 61f25d3cf3f7149aec8cca53334d33fbf4649ea3..0705848899c18efb949c4953ff30ab0f9fef266b 100644 (file)
@@ -194,18 +194,19 @@ fail:
 static struct page *ufs_get_page(struct inode *dir, unsigned long n)
 {
        struct address_space *mapping = dir->i_mapping;
-       struct page *page = read_mapping_page(mapping, n, NULL);
-       if (!IS_ERR(page)) {
-               kmap(page);
-               if (unlikely(!PageChecked(page))) {
-                       if (!ufs_check_page(page))
-                               goto fail;
-               }
+       struct folio *folio = read_mapping_folio(mapping, n, NULL);
+
+       if (IS_ERR(folio))
+               return &folio->page;
+       kmap(&folio->page);
+       if (unlikely(!folio_test_checked(folio))) {
+               if (!ufs_check_page(&folio->page))
+                       goto fail;
        }
-       return page;
+       return &folio->page;
 
 fail:
-       ufs_put_page(page);
+       ufs_put_page(&folio->page);
        return ERR_PTR(-EIO);
 }