]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
qnx6: Convert qnx6_checkroot() to use a folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Wed, 10 Jul 2024 12:22:12 +0000 (08:22 -0400)
committerChristian Brauner <brauner@kernel.org>
Wed, 7 Aug 2024 09:31:55 +0000 (11:31 +0200)
Removes a use of kmap and removes a conversion from folio to 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/qnx6/inode.c

index 4f1735b882b109bd5b63aa2bd18da04bf118768a..6adee850278edb1514e2cbd59dcad036e5423433 100644 (file)
@@ -184,17 +184,17 @@ static const char *qnx6_checkroot(struct super_block *s)
        struct qnx6_dir_entry *dir_entry;
        struct inode *root = d_inode(s->s_root);
        struct address_space *mapping = root->i_mapping;
-       struct page *page = read_mapping_page(mapping, 0, NULL);
-       if (IS_ERR(page))
+       struct folio *folio = read_mapping_folio(mapping, 0, NULL);
+
+       if (IS_ERR(folio))
                return "error reading root directory";
-       kmap(page);
-       dir_entry = page_address(page);
+       dir_entry = kmap_local_folio(folio, 0);
        for (i = 0; i < 2; i++) {
                /* maximum 3 bytes - due to match_root limitation */
                if (strncmp(dir_entry[i].de_fname, match_root[i], 3))
                        error = 1;
        }
-       qnx6_put_page(page);
+       folio_release_kmap(folio, dir_entry);
        if (error)
                return "error reading root directory.";
        return NULL;