From: Matthew Wilcox (Oracle) <willy@infradead.org>
Date: Wed, 10 Jul 2024 12:22:12 +0000 (-0400)
Subject: qnx6: Convert qnx6_checkroot() to use a folio
X-Git-Tag: v6.12-rc1~214^2~2^2~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29c42e8b8a7813479961f868fb4189295943c07d;p=thirdparty%2Fkernel%2Flinux.git

qnx6: Convert qnx6_checkroot() to use a folio

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>
---

diff --git a/fs/qnx6/inode.c b/fs/qnx6/inode.c
index 4f1735b882b10..6adee850278ed 100644
--- a/fs/qnx6/inode.c
+++ b/fs/qnx6/inode.c
@@ -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;