From: Matthew Wilcox (Oracle) <willy@infradead.org>
Date: Mon, 10 Feb 2025 13:34:42 +0000 (+0000)
Subject: gfs2: Use b_folio in gfs2_check_magic()
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e6ff5f2089ebb40422832d9b94cf6e998baa7551;p=users%2Fdwmw2%2Flinux.git

gfs2: Use b_folio in gfs2_check_magic()

We are preparing to remove bh->b_page.  Use kmap_local_folio() instead
of kmap_local_page().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index d27f34688ff5b..4123bfc166808 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -615,15 +615,13 @@ static struct page *gfs2_get_log_desc(struct gfs2_sbd *sdp, u32 ld_type,
 
 static void gfs2_check_magic(struct buffer_head *bh)
 {
-	void *kaddr;
 	__be32 *ptr;
 
 	clear_buffer_escaped(bh);
-	kaddr = kmap_local_page(bh->b_page);
-	ptr = kaddr + bh_offset(bh);
+	ptr = kmap_local_folio(bh->b_folio, bh_offset(bh));
 	if (*ptr == cpu_to_be32(GFS2_MAGIC))
 		set_buffer_escaped(bh);
-	kunmap_local(kaddr);
+	kunmap_local(ptr);
 }
 
 static int blocknr_cmp(void *priv, const struct list_head *a,