OpenZFS 2.2.7 doest not compile with Linux 6.14-rc1

[KrzysztofHajdamowicz]

System information

Type	Version/Name
Distribution Name	Proxmox + custom kernel
Distribution Version	8
Kernel Version	6.14-rc1
Architecture	x86_64
OpenZFS Version	2.2.7

Describe the problem you're observing

OpenZFS 2.2.7 does not compile with kernel 6.14-rc1

  CC [M]  os/linux/zfs/zpl_file_range.o
os/linux/zfs/zpl_ctldir.c:204:27: error: initialization of 'int (*)(struct inode *, const struct qstr *, struct dentry *, unsigned int)' from incompatible pointer type 'int (*)(struct dentry *, unsigned int)' [-Werror=incompatible-pointer-types]
  204 |         .d_revalidate   = zpl_snapdir_revalidate,
      |                           ^~~~~~~~~~~~~~~~~~~~~~
os/linux/zfs/zpl_ctldir.c:204:27: note: (near initialization for 'zpl_dops_snapdirs.d_revalidate')

Describe how to reproduce the problem

Issue appears when compiling kernel 6.14- there was no issue with kernel 6.13.

To try it at your own:

1. Grab pve-kernel repo https://github.com/KrzysztofHajdamowicz/pve-kernel
2. git submodule init && git submodule update
3. cd submodules/ubuntu-kernel && git remote add github https://github.com/KrzysztofHajdamowicz/mirror_ubuntu-kernels.git
4. cd submodules/ubuntu-kernel && git checkout github/build
5. Use https://github.com/KrzysztofHajdamowicz/pve-kernel-zfsonlinux as submodules/zfsonlinux (note upstream submodule that point to openzfs/zfs repo)
6. make
7. Result is: build.txt

6.14 (and even 6.13) is too new to be mentioned as supported in release notes but FIY some code changes will be needed in the future 🙂

[robn]

@KrzysztofHajdamowicz #17026 posted to add support for 6.14. Once that kernel is released and support on master looks good, we'll likely backport it for a 2.2.x release. In the meantime, it's a very small amount of change, so if you're in the mood to test, you might like to apply those two patches yourself to 2.2.7 and give them a try.

[KrzysztofHajdamowicz]

I've cherry-picked those commits, kernel compiled and booted from rootfs on ZFS. Works for me, thanks!

[KrzysztofHajdamowicz]

I can confirm that patchet from #17026 works for all 6.14 versions up to v6.14 git tag in Linus repo.

[dylandn]

Nevermind. User error. I used the copy_builtin.sh script to add zfs to both 2.12 and 2.14 kernels and it feels like if you apply it to a 2.14 kernel first then to a 2.12 kernel later, zfs_config.h and HAVE_D_REVALIDATE_4ARGS doesn't get refreshed.