0.3.16

This release adds support for the upcoming 6.17 kernel version. Signed-off-by: Ernesto A. Fernández <ernesto@corellium.com>
Set dentry operations in the new way
2026-08-18 02:19:59 -07:00 · 2025-09-27 13:17:31 -03:00 · 2025-09-16 14:02:10 -03:00 · 2025-09-16 13:43:22 -03:00 · 2025-09-15 20:15:01 -03:00
4 changed files with 32 additions and 3 deletions
@@ -1021,8 +1021,13 @@ extern struct inode *apfs_new_inode(struct inode *dir, umode_t mode,
 extern int apfs_create_inode_rec(struct super_block *sb, struct inode *inode,
 				 struct dentry *dentry);
 extern int apfs_inode_create_exclusive_dstream(struct inode *inode);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
+extern int __apfs_write_begin(const struct kiocb *iocb, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int flags, struct page **pagep, void **fsdata);
+extern int __apfs_write_end(const struct kiocb *iocb, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int copied, struct page *page, void *fsdata);
+#else
 extern int __apfs_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int flags, struct page **pagep, void **fsdata);
 extern int __apfs_write_end(struct file *file, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int copied, struct page *page, void *fsdata);
+#endif
 extern int apfs_dstream_adj_refcnt(struct apfs_dstream_info *dstream, u32 delta);

 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0)
@@ -1061,6 +1066,10 @@ extern int apfs_getattr(struct mnt_idmap *idmap,

 extern int apfs_crypto_adj_refcnt(struct super_block *sb, u64 crypto_id, int delta);

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
+#define fileattr file_kattr
+#endif
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) || RHEL_VERSION_GE(9, 6)
 extern int apfs_fileattr_get(struct dentry *dentry, struct fileattr *fa);
 extern int apfs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry, struct fileattr *fa);
@@ -1,5 +1,5 @@
 PACKAGE_NAME="linux-apfs-rw"
-PACKAGE_VERSION="0.3.15"
+PACKAGE_VERSION="0.3.16"

 BUILT_MODULE_NAME[0]="apfs"
 DEST_MODULE_LOCATION[0]="/extra"
@@ -470,7 +470,11 @@ out:
 	return ret;
 }

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
+int __apfs_write_begin(const struct kiocb *file, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int flags, struct page **pagep, void **fsdata)
+#else
 int __apfs_write_begin(struct file *file, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int flags, struct page **pagep, void **fsdata)
+#endif
 {
 	struct inode *inode = mapping->host;
 	struct apfs_dstream_info *dstream = &APFS_I(inode)->i_dstream;
@@ -584,7 +588,11 @@ out_put_page:
 	return err;
 }

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
+static int apfs_write_begin(const struct kiocb *file, struct address_space *mapping,
+			    loff_t pos, unsigned int len,
+			    struct folio **foliop, void **fsdata)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
 static int apfs_write_begin(struct file *file, struct address_space *mapping,
 			    loff_t pos, unsigned int len,
 			    struct folio **foliop, void **fsdata)
@@ -629,7 +637,11 @@ fail:
 	return err;
 }

+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
+int __apfs_write_end(const struct kiocb *file, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int copied, struct page *page, void *fsdata)
+#else
 int __apfs_write_end(struct file *file, struct address_space *mapping, loff_t pos, unsigned int len, unsigned int copied, struct page *page, void *fsdata)
+#endif
 {
 	struct inode *inode = mapping->host;
 	struct apfs_dstream_info *dstream = &APFS_I(inode)->i_dstream;
@@ -652,7 +664,11 @@ int __apfs_write_end(struct file *file, struct address_space *mapping, loff_t po
 	return ret;
 }

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
+static int apfs_write_end(const struct kiocb *file, struct address_space *mapping,
+			  loff_t pos, unsigned int len, unsigned int copied,
+			  struct folio *folio, void *fsdata)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
 static int apfs_write_end(struct file *file, struct address_space *mapping,
 			  loff_t pos, unsigned int len, unsigned int copied,
 			  struct folio *folio, void *fsdata)
@@ -1585,7 +1585,11 @@ static int apfs_fill_super(struct super_block *sb, void *data, int silent)
 		goto failed_cat;

 	sb->s_op = &apfs_sops;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
+	set_default_d_op(sb, &apfs_dentry_operations);
+#else
 	sb->s_d_op = &apfs_dentry_operations;
+#endif
 	sb->s_xattr = apfs_xattr_handlers;
 	sb->s_maxbytes = MAX_LFS_FILESIZE;
 	sb->s_time_gran = 1; /* Nanosecond granularity */
Author	SHA1	Message	Date
Ernesto A. Fernández	c76aecff25	0.3.16 This release adds support for the upcoming 6.17 kernel version. Signed-off-by: Ernesto A. Fernández <ernesto@corellium.com>	2025-09-27 13:17:31 -03:00
Ernesto A. Fernández	714202fefa	Set dentry operations in the new way Once more, the build is still broken for the 6.17 release candidate. This time the problem is that we are no longer allowed to set s_d_op directly. Use the new helper instead. Signed-off-by: Ernesto A. Fernández <ernesto@corellium.com>	2025-09-16 14:02:10 -03:00
Ernesto A. Fernández	44db9dc02e	Fix the apfs_write_begin/end() type for 6.17 The build is still broken for the 6.17 release candidate. The problem is that ->write_begin() and ->write_end() now take a kiocb struct as the first argument instead of a file. Add the proper version checks. The driver does nothing with this argument but pass it along, so continue to call it "file" to keep the patch simple. Signed-off-by: Ernesto A. Fernández <ernesto@corellium.com>	2025-09-16 13:43:22 -03:00
Ernesto A. Fernández	aefae5433f	Rename "struct fileattr" to "struct file_kattr" The build is broken for the 6.17 release candidate: https://github.com/linux-apfs/linux-apfs-rw/issues/102 Upstream has renamed the fileattr struct to file_kattr, so that needs to happen here as well. To avoid excessive nesting of version checks, don't change the actual code and just rewrite it on build time with a macro. I hope this doesn't cause any trouble in the future... Signed-off-by: Ernesto A. Fernández <ernesto@corellium.com>	2025-09-15 20:15:01 -03:00