Navigation Menu

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

Fix for current_kernel_time in 4.20 on 0.7.x #8227

Closed
wants to merge 1 commit into from

Conversation

satmandu
Copy link
Contributor

While openzfs/spl@cd1b28e fixed the 4.20 current_kernel_time issues in the 0.7.x spl tree as per #8074 in 0.7.x, current_kernel_time is still being used inside zpios-ctl.h inside the 0.7.x zfs tree.

I believe this patch may fix this issue in 0.7.x to allow it to compile successfully for linux kernel 4.20.

Apologies if the coding style is inappropriate. The compiled module once so modified does work on my system, but I have not run tests on this.

current_kernel_time needs to be updated for linux kernel 4.20 compatibility. While the 0.7.x spl's sys/include/time.h file was updated, in the 0.7.x zfs tree zpios-ctl.h also uses current_kernel_time.

Motivation and Context

Fixed compile for 4.20 on 0.7.x on my ubuntu system.

The modifications as as per the issue referenced here: #8074 and also as applied in this commit: openzfs/spl@cd1b28e

Description

How Has This Been Tested?

Types of changes

  • [ x ] 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)
  • Documentation (a change to man pages or other documentation)

Checklist:

  • [X ] My code follows the ZFS on Linux code style requirements.
  • I have updated the documentation accordingly.
  • [ X ] I have read the contributing document.
    (Note that this is for the 0.7.x branch and NOT for master.)
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commit messages are properly formatted and contain Signed-off-by.

While openzfs/spl@cd1b28e fixed the 4.20 current_kernel_time issues in spl as per openzfs#8074 in .07.x, current_kernel_time is still being used inside zpios-ctl.h in 0.7.x.

I believe this may fix this issue in 0.7.x to allow it to compile successfully for kernel 4.2.0.
@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Dec 26, 2018
Copy link
Member

@gmelikov gmelikov left a comment

Choose a reason for hiding this comment

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

LGTM

@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Dec 28, 2018
@T4cC0re
Copy link

T4cC0re commented Dec 31, 2018

Hey there, I just stumbled upon this after upgrades to my Arch Linux install with zfs 0.7.12 to the 4.20 kernel.

Just adding a datapoint: This patch works flawlessly 👍 Would be grateful if this could get merged and tagged as soon as possible, as 4.20 is the kernel that is distributed with Arch right now and currently zfs breaks DKMS builds without this patch.

@satmandu
Copy link
Contributor Author

@tonyhutter If you would consider adding this to https://github.com/zfsonlinux/zfs/projects/21 ?

@tonyhutter tonyhutter added this to To do in 0.7.13 Jan 7, 2019
gyakovlev pushed a commit to gyakovlev/zfs that referenced this pull request Jan 9, 2019
just a copy of openzfs#8227
with builder configuration, want to test the patch.

Requires-spl: spl-0.7-release
Signed-off-by: gyakovlev@gentoo.org
gyakovlev pushed a commit to gyakovlev/zfs that referenced this pull request Jan 9, 2019
just a copy of openzfs#8227
with builder configuration, want to test the patch.

Requires-spl: spl-0.7-release
Requires-builders: test unstable
Signed-off-by: gyakovlev@gentoo.org
gyakovlev added a commit to gyakovlev/zfs that referenced this pull request Jan 9, 2019
just a copy of openzfs#8227
with builder configuration, want to test the patch.

Requires-spl: spl-0.7-release
Requires-builders: test unstable
Signed-off-by: gyakovlev@gentoo.org
gyakovlev added a commit to gyakovlev/zfs that referenced this pull request Jan 9, 2019
just a copy of openzfs#8227
with builder configuration, want to test the patch.

Requires-spl: spl-0.7-release
Requires-builders: test unstable
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
@tonyhutter tonyhutter moved this from To do to In progress in 0.7.13 Jan 28, 2019
@behlendorf behlendorf mentioned this pull request Feb 5, 2019
12 tasks
@behlendorf
Copy link
Contributor

Closing, this fix has been included in the openzfs/spl#713 patch set.

@behlendorf behlendorf closed this Feb 7, 2019
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
No open projects
0.7.13
  
In progress
Development

Successfully merging this pull request may close these issues.

None yet

4 participants