diff -Naurp hfsplus-0.7.orig/inode.c hfsplus-0.7/inode.c
--- hfsplus-0.7.orig/inode.c	2023-10-03 13:09:50.000000000 +0100
+++ hfsplus-0.7/inode.c	2023-11-11 17:07:50.471274961 +0000
@@ -64,14 +64,15 @@ static sector_t hfsplus_bmap(struct addr
 	return generic_block_bmap(mapping, block, hfsplus_get_block);
 }
 
-static int hfsplus_releasepage(struct page *page, gfp_t mask)
+static bool hfsplus_release_folio(struct folio *folio, gfp_t mask)
 {
-	struct inode *inode = page->mapping->host;
+	struct inode *inode = folio->mapping->host;
 	struct super_block *sb = inode->i_sb;
 	struct hfs_btree *tree;
 	struct hfs_bnode *node;
 	u32 nidx;
-	int i, res = 1;
+	int i;
+	bool res = true;
 
 	switch (inode->i_ino) {
 	case HFSPLUS_EXT_CNID:
@@ -85,26 +86,26 @@ static int hfsplus_releasepage(struct pa
 		break;
 	default:
 		BUG();
-		return 0;
+		return false;
 	}
 	if (!tree)
-		return 0;
+		return false;
 	if (tree->node_size >= PAGE_SIZE) {
-		nidx = page->index >>
+		nidx = folio->index >>
 			(tree->node_size_shift - PAGE_SHIFT);
 		spin_lock(&tree->hash_lock);
 		node = hfs_bnode_findhash(tree, nidx);
 		if (!node)
 			;
 		else if (atomic_read(&node->refcnt))
-			res = 0;
+			res = false;
 		if (res && node) {
 			hfs_bnode_unhash(node);
 			hfs_bnode_free(node);
 		}
 		spin_unlock(&tree->hash_lock);
 	} else {
-		nidx = page->index <<
+		nidx = folio->index <<
 			(PAGE_SHIFT - tree->node_size_shift);
 		i = 1 << (PAGE_SHIFT - tree->node_size_shift);
 		spin_lock(&tree->hash_lock);
@@ -113,7 +114,7 @@ static int hfsplus_releasepage(struct pa
 			if (!node)
 				continue;
 			if (atomic_read(&node->refcnt)) {
-				res = 0;
+				res = false;
 				break;
 			}
 			hfs_bnode_unhash(node);
@@ -121,7 +122,7 @@ static int hfsplus_releasepage(struct pa
 		} while (--i && nidx < tree->node_count);
 		spin_unlock(&tree->hash_lock);
 	}
-	return res ? try_to_free_buffers(page) : 0;
+	return res ? try_to_free_buffers(folio) : false;
 }
 
 static ssize_t hfsplus_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
@@ -163,7 +164,7 @@ const struct address_space_operations hf
 	.write_begin	= hfsplus_write_begin,
 	.write_end	= generic_write_end,
 	.bmap		= hfsplus_bmap,
-	.releasepage	= hfsplus_releasepage,
+	.release_folio	= hfsplus_release_folio,
 };
 
 const struct address_space_operations hfsplus_aops = {

diff -Naurp hfsplus-0.7.orig/extents.c hfsplus-0.7/extents.c
--- hfsplus-0.7.orig/extents.c	2023-10-03 13:09:50.000000000 +0100
+++ hfsplus-0.7/extents.c	2023-11-11 18:35:09.984412209 +0000
@@ -554,15 +554,15 @@ void hfsplus_file_truncate(struct inode
 	if (inode->i_size > hip->phys_size) {
 		struct address_space *mapping = inode->i_mapping;
 		struct page *page;
-		void *fsdata;
+		void *fsdata = NULL;
 		loff_t size = inode->i_size;
 
-		res = pagecache_write_begin(NULL, mapping, size, 0, 0,
-					    &page, &fsdata);
+		res = hfsplus_write_begin(NULL, mapping, size, 0,
+					  &page, &fsdata);
 		if (res)
 			return;
-		res = pagecache_write_end(NULL, mapping, size,
-			0, 0, page, fsdata);
+		res = generic_write_end(NULL, mapping, size, 0, 0,
+					page, fsdata);
 		if (res < 0)
 			return;
 		mark_inode_dirty(inode);
diff -Naurp hfsplus-0.7.orig/hfsplus_fs.h hfsplus-0.7/hfsplus_fs.h
--- hfsplus-0.7.orig/hfsplus_fs.h	2023-10-03 13:09:50.000000000 +0100
+++ hfsplus-0.7/hfsplus_fs.h	2023-11-11 18:47:59.483965812 +0000
@@ -468,6 +468,8 @@ extern const struct address_space_operat
 extern const struct address_space_operations hfsplus_btree_aops;
 extern const struct dentry_operations hfsplus_dentry_operations;
 
+int hfsplus_write_begin(struct file *file, struct address_space *mapping,
+		loff_t pos, unsigned len, struct page **pagep, void **fsdata);
 struct inode *hfsplus_new_inode(struct super_block *sb, struct inode *dir,
 				umode_t mode);
 void hfsplus_delete_inode(struct inode *inode);
diff -Naurp hfsplus-0.7.orig/inode.c hfsplus-0.7/inode.c
--- hfsplus-0.7.orig/inode.c	2023-10-03 13:09:50.000000000 +0100
+++ hfsplus-0.7/inode.c	2023-11-11 18:54:53.750386508 +0000
@@ -43,7 +43,7 @@ static void hfsplus_write_failed(struct
 	}
 }
 
-static int hfsplus_write_begin(struct file *file, struct address_space *mapping,
+int hfsplus_write_begin(struct file *file, struct address_space *mapping,
 			loff_t pos, unsigned len,
 			struct page **pagep, void **fsdata)
 {