Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Linux 5.17 compat: PDE_DATA() renamed to pde_data() #13007

Closed
wants to merge 1 commit into from

Conversation

nabijaczleweli
Copy link
Contributor

Motivation and Context

#13004

How Has This Been Tested?

Local build for pre-5.17, CI for 5.17.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

  • My code follows the OpenZFS code style requirements.
  • I have updated the documentation accordingly.
  • I have read the contributing document.
  • I have added tests to cover my changes. – none apply
  • I have run the ZFS Test Suite with this change applied. – CI take my hand
  • All commit messages are properly formatted and contain Signed-off-by.

@ckane
Copy link
Contributor

ckane commented Jan 24, 2022

Thanks, I'll test this out tonight

@satmandu
Copy link
Contributor

I'm still seeing this error locally:

configure:48833: checking whether PDE_DATA() is available
configure:48841: error:
        *** None of the expected "PDE_DATA" interfaces were detected.
        *** This may be because your kernel version is newer than what is
        *** supported, or you are using a patched custom kernel with
        *** incompatible modifications.
        ***
        *** ZFS Version: zfs-2.1.2-1.3
        *** Compatible Kernels: 3.10 - 5.15

(For what it is worth I am building the kernel module on a 5.16.2 system using dkms pointing to the 5.17 headers...)

@nabijaczleweli nabijaczleweli force-pushed the new-new-linux branch 2 times, most recently from cef7b3d to 5453de7 Compare January 24, 2022 20:24
@nabijaczleweli
Copy link
Contributor Author

nabijaczleweli commented Jan 24, 2022

uhoh, yeah, I didn't look hard enough and didn't notice the already-present PDE_DATA() config hunk; fixed, and actually passes on the buildd too now :) – please try again?

@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Jan 24, 2022
Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

config/kernel-pde-data.m4 Outdated Show resolved Hide resolved
Upstream commit 359745d78351c6f5442435f81549f0207ece28aa
("proc: remove PDE_DATA() completely")

Link: https://lore.kernel.org/all/[email protected]/T/#u
Closes: openzfs#13004
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
@satmandu
Copy link
Contributor

uhoh, yeah, I didn't look hard enough and didn't notice the already-present PDE_DATA() config hunk; fixed, and actually passes on the buildd too now :) – please try again?

That works!

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Jan 24, 2022
@ckane
Copy link
Contributor

ckane commented Jan 25, 2022

I suspect that this works, but there also seems to be another likely unrelated regression introduced by 5.17 that is causing the build to fail on my system, so I cannot run-time test it until that's fixed too. This does seem to properly address the PDE_DATA changes though.

@nabijaczleweli
Copy link
Contributor Author

Picked on top of #12989

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants