Support for kernel 6.7

[eafer: fixed some issues with folios and timestamps] Signed-off-by: Ernesto A. Fernández <ernesto@corellium.com>

Author: terraluna977

apfs.h

@@ -1142,7 +1142,11 @@ apfs_getblk(struct super_block *sb, sector_t block)
 {
 structbuffer_head*bh;
 
+#ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 bh=__getblk_gfp(APFS_NXI(sb)->nx_bdev, block, sb->s_blocksize, __GFP_MOVABLE);
+#else
+bh=bdev_getblk(APFS_NXI(sb)->nx_bdev, block, sb->s_blocksize, __GFP_MOVABLE);
+#endif
 if (bh)
 set_buffer_uptodate(bh);
 returnbh;

dir.c

@@ -604,8 +604,10 @@ static int apfs_create_dentry(struct dentry *dentry, struct inode *inode)
 /* Now update the parent inode */
 #ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 6, 0)
 parent->i_mtime=parent->i_ctime=current_time(inode);
-#else
+#elifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 parent->i_mtime=inode_set_ctime_current(parent);
+#else
+inode_set_mtime_to_ts(parent, inode_set_ctime_current(parent));
 #endif
 ++APFS_I(parent)->i_nchildren;
 apfs_inode_join_transaction(parent->i_sb, parent);
@@ -1037,8 +1039,10 @@ static int apfs_delete_dentry(struct dentry *dentry)
 /* Now update the parent inode */
 #ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 6, 0)
 parent->i_mtime=parent->i_ctime=current_time(parent);
-#else
+#elifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 parent->i_mtime=inode_set_ctime_current(parent);
+#else
+inode_set_mtime_to_ts(parent, inode_set_ctime_current(parent));
 #endif
 --APFS_I(parent)->i_nchildren;
 apfs_inode_join_transaction(sb, parent);
@@ -1201,8 +1205,10 @@ static int apfs_create_orphan_link(struct inode *inode)
 /* Now update the child count for private-dir */
 #ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 6, 0)
 priv_dir->i_mtime=priv_dir->i_ctime=current_time(priv_dir);
-#else
+#elifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 priv_dir->i_mtime=inode_set_ctime_current(priv_dir);
+#else
+inode_set_mtime_to_ts(priv_dir, inode_set_ctime_current(priv_dir));
 #endif
 ++APFS_I(priv_dir)->i_nchildren;
 apfs_inode_join_transaction(sb, priv_dir);
@@ -1250,8 +1256,10 @@ int apfs_delete_orphan_link(struct inode *inode)
 /* Now update the child count for private-dir */
 #ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 6, 0)
 priv_dir->i_mtime=priv_dir->i_ctime=current_time(priv_dir);
-#else
+#elifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 priv_dir->i_mtime=inode_set_ctime_current(priv_dir);
+#else
+inode_set_mtime_to_ts(priv_dir, inode_set_ctime_current(priv_dir));
 #endif
 --APFS_I(priv_dir)->i_nchildren;
 apfs_inode_join_transaction(sb, priv_dir);

extents.c

@@ -1694,8 +1694,10 @@ int apfs_clone_file_range(struct file *src_file, loff_t off, struct file *dst_fi
 
 #ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 6, 0)
 dst_inode->i_mtime=dst_inode->i_ctime=current_time(dst_inode);
-#else
+#elifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 dst_inode->i_mtime=inode_set_ctime_current(dst_inode);
+#else
+inode_set_mtime_to_ts(dst_inode, inode_set_ctime_current(dst_inode));
 #endif
 dst_inode->i_size=src_inode->i_size;
 dst_ai->i_key_class=src_ai->i_key_class;
@@ -2171,7 +2173,11 @@ int apfs_nonsparse_dstream_read(struct apfs_dstream_info *dstream, void *buf, si
  goto out;
  }
 
+#ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 bhs[idx] =__getblk_gfp(APFS_NXI(sb)->nx_bdev, bno, sb->s_blocksize, __GFP_MOVABLE);
+#else
+bhs[idx] =bdev_getblk(APFS_NXI(sb)->nx_bdev, bno, sb->s_blocksize, __GFP_MOVABLE);
+#endif
 if (!bhs[idx]) {
 apfs_err(sb, "failed to map block 0x%llx", bno);
 ret=-EIO;
@@ -2243,7 +2249,11 @@ void apfs_nonsparse_dstream_preread(struct apfs_dstream_info *dstream)
 if (ret||bno==0)
 return;
 
+#ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 bh=__getblk_gfp(APFS_NXI(sb)->nx_bdev, bno, sb->s_blocksize, __GFP_MOVABLE);
+#else
+bh=bdev_getblk(APFS_NXI(sb)->nx_bdev, bno, sb->s_blocksize, __GFP_MOVABLE);
+#endif
 if (!bh)
 return;
 if (!buffer_uptodate(bh)) {

file.c

@@ -18,6 +18,9 @@ static vm_fault_t apfs_page_mkwrite(struct vm_fault *vmf)
 structvm_area_struct*vma=vmf->vma;
 #endif
 structpage*page=vmf->page;
+#ifLINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)
+structfolio*folio;
+#endif
 structinode*inode=file_inode(vma->vm_file);
 structsuper_block*sb=inode->i_sb;
 structbuffer_head*bh, *head;
@@ -54,8 +57,16 @@ static vm_fault_t apfs_page_mkwrite(struct vm_fault *vmf)
  goto out_unlock;
  }
 
-if (!page_has_buffers(page))
+if (!page_has_buffers(page)) {
+#ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 create_empty_buffers(page, sb->s_blocksize, 0);
+#else
+folio=page_folio(page);
+bh=folio_buffers(folio);
+if (!bh)
+bh=create_empty_buffers(folio, sb->s_blocksize, 0);
+#endif
+ }
 
 size=i_size_read(inode);
 if (page->index==size >> PAGE_SHIFT)

inode.c

@@ -476,6 +476,9 @@ int __apfs_write_begin(struct file *file, struct address_space *mapping, loff_t
 structapfs_dstream_info*dstream=&APFS_I(inode)->i_dstream;
 structsuper_block*sb=inode->i_sb;
 structpage*page;
+#ifLINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)
+structfolio*folio;
+#endif
 structbuffer_head*bh, *head;
 unsigned intblocksize, block_start, block_end, from, to;
 pgoff_tindex=pos >> PAGE_SHIFT;
@@ -508,8 +511,16 @@ int __apfs_write_begin(struct file *file, struct address_space *mapping, loff_t
 #endif
 if (!page)
 return-ENOMEM;
-if (!page_has_buffers(page))
+if (!page_has_buffers(page)) {
+#ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 create_empty_buffers(page, sb->s_blocksize, 0);
+#else
+folio=page_folio(page);
+bh=folio_buffers(folio);
+if (!bh)
+bh=create_empty_buffers(folio, sb->s_blocksize, 0);
+#endif
+ }
 
 /* CoW moves existing blocks, so read them but mark them as unmapped */
 head=page_buffers(page);
@@ -787,13 +798,19 @@ static int apfs_inode_from_query(struct apfs_query *query, struct inode *inode)
 ai->i_nchildren=le32_to_cpu(inode_val->nchildren);
  }
 
-inode->i_atime=ns_to_timespec64(le64_to_cpu(inode_val->access_time));
 #ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 6, 0)
 inode->i_ctime=ns_to_timespec64(le64_to_cpu(inode_val->change_time));
 #else
 inode_set_ctime_to_ts(inode, ns_to_timespec64(le64_to_cpu(inode_val->change_time)));
 #endif
+
+#ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
+inode->i_atime=ns_to_timespec64(le64_to_cpu(inode_val->access_time));
 inode->i_mtime=ns_to_timespec64(le64_to_cpu(inode_val->mod_time));
+#else
+inode_set_atime_to_ts(inode, ns_to_timespec64(le64_to_cpu(inode_val->access_time)));
+inode_set_mtime_to_ts(inode, ns_to_timespec64(le64_to_cpu(inode_val->mod_time)));
+#endif
 ai->i_crtime=ns_to_timespec64(le64_to_cpu(inode_val->create_time));
 
 dstream->ds_size=inode->i_size=inode->i_blocks=0;
@@ -1097,6 +1114,9 @@ static int apfs_build_inode_val(struct inode *inode, struct qstr *qname,
 {
 structapfs_inode_val*val;
 structapfs_x_fieldxkey;
+#ifLINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)
+structtimespec64ts;
+#endif
 inttotal_xlen, val_len;
 boolis_device=S_ISCHR(inode->i_mode) ||S_ISBLK(inode->i_mode);
 __le32rdev;
@@ -1115,7 +1135,12 @@ static int apfs_build_inode_val(struct inode *inode, struct qstr *qname,
 val->parent_id=cpu_to_le64(APFS_I(inode)->i_parent_id);
 val->private_id=cpu_to_le64(apfs_ino(inode));
 
+#ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 val->mod_time=cpu_to_le64(timespec64_to_ns(&inode->i_mtime));
+#else
+ts=inode_get_mtime(inode);
+val->mod_time=cpu_to_le64(timespec64_to_ns(&ts));
+#endif
 val->create_time=val->change_time=val->access_time=val->mod_time;
 
 if (S_ISDIR(inode->i_mode))
@@ -1477,14 +1502,22 @@ int apfs_update_inode(struct inode *inode, char *new_name)
 if (gid_valid(sbi->s_gid))
 inode_raw->group=cpu_to_le32(ai->i_saved_gid);
 
-inode_raw->access_time=cpu_to_le64(timespec64_to_ns(&inode->i_atime));
 #ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 6, 0)
 inode_raw->change_time=cpu_to_le64(timespec64_to_ns(&inode->i_ctime));
 #else
 structtimespec64ictime=inode_get_ctime(inode);
 inode_raw->change_time=cpu_to_le64(timespec64_to_ns(&ictime));
 #endif
+
+#ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
+inode_raw->access_time=cpu_to_le64(timespec64_to_ns(&inode->i_atime));
 inode_raw->mod_time=cpu_to_le64(timespec64_to_ns(&inode->i_mtime));
+#else
+structtimespec64ts=inode_get_mtime(inode);
+inode_raw->mod_time=cpu_to_le64(timespec64_to_ns(&ts));
+ts=inode_get_atime(inode);
+inode_raw->access_time=cpu_to_le64(timespec64_to_ns(&ts));
+#endif
 inode_raw->create_time=cpu_to_le64(timespec64_to_ns(&ai->i_crtime));
 
 if (S_ISDIR(inode->i_mode)) {
@@ -1665,9 +1698,11 @@ struct inode *apfs_new_inode(struct inode *dir, umode_t mode, dev_t rdev)
 now=current_time(inode);
 #ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 6, 0)
 inode->i_atime=inode->i_mtime=inode->i_ctime=ai->i_crtime=now;
-#else
+#elifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 inode_set_ctime_to_ts(inode, now);
 inode->i_atime=inode->i_mtime=ai->i_crtime=now;
+#else
+ai->i_crtime=simple_inode_init_ts(inode);
 #endif
 vsb_raw->apfs_last_mod_time=cpu_to_le64(timespec64_to_ns(&now));
 
@@ -1762,8 +1797,10 @@ static int apfs_setsize(struct inode *inode, loff_t new_size)
 return0;
 #ifLINUX_VERSION_CODE<KERNEL_VERSION(6, 6, 0)
 inode->i_mtime=inode->i_ctime=current_time(inode);
-#else
+#elifLINUX_VERSION_CODE<KERNEL_VERSION(6, 7, 0)
 inode->i_mtime=inode_set_ctime_current(inode);
+#else
+inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode));
 #endif
 
 err=apfs_inode_create_dstream_rec(inode);