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.

Sign up for GitHub

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

Jump to bottom

Kernel 5.18 compat #13278

Closed
wants to merge 2 commits into from
Closed

Kernel 5.18 compat #13278

wants to merge 2 commits into from

Conversation

ret2libc
Copy link
Contributor

@ret2libc ret2libc commented Apr 2, 2022

Motivation and Context

Trying to compile with kernel 5.18 7a3ecddc571cc3294e5d6bb5948ff2b0cfa12735 didn't work.

Description

  1. define our own version of vdev_blkg_tryget even when HAVE_BLKG_TRYGET is not defined
  2. use ->readahead when ->readpages is not present and implement ->readahead accordingly without the removed read_cache_pages() function.

How Has This Been Tested?

Compilation + use of lxc on ubuntu, which required it.

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:

ret2libc added 2 commits April 2, 2022 11:28
@ret2libc
Linux 5.18 compat: blkg_tryget is moved to private headers
3b8178e 
Signed-off-by: Riccardo Schirone <[email protected]>
@ret2libc
Linux 5.18 compat: use address_space_operations->readahead
bb592d1 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Signed-off-by: Riccardo Schirone <[email protected]>
@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Apr 4, 2022
@behlendorf
Copy link
Contributor

Thanks for the compatibility fixes for 5.18!

@behlendorf behlendorf closed this in 036e846 Apr 4, 2022
behlendorf pushed a commit that referenced this pull request Apr 4, 2022
@ret2libc @behlendorf
Linux 5.18 compat: use address_space_operations->readahead
7d524c0 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes #13278
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Apr 4, 2022
@ret2libc @behlendorf
Linux 5.18 compat: blkg_tryget is moved to private headers
79e0ac9 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Apr 4, 2022
@ret2libc @behlendorf
Linux 5.18 compat: use address_space_operations->readahead
2d526c1 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Apr 6, 2022
@ret2libc @behlendorf
Linux 5.18 compat: blkg_tryget is moved to private headers
9790f68 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Apr 6, 2022
@ret2libc @behlendorf
Linux 5.18 compat: use address_space_operations->readahead
73362e3 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
behlendorf pushed a commit that referenced this pull request Apr 6, 2022
@ret2libc @behlendorf
Linux 5.18 compat: blkg_tryget is moved to private headers
10a9f5f 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes #13278
behlendorf pushed a commit that referenced this pull request Apr 6, 2022
@ret2libc @behlendorf
Linux 5.18 compat: use address_space_operations->readahead
35ddd8e 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes #13278
BrainSlayer pushed a commit to BrainSlayer/zfs that referenced this pull request Apr 11, 2022
@ret2libc @BrainSlayer
Linux 5.18 compat: blkg_tryget is moved to private headers
9f9c439 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
BrainSlayer pushed a commit to BrainSlayer/zfs that referenced this pull request Apr 11, 2022
@ret2libc @BrainSlayer
Linux 5.18 compat: use address_space_operations->readahead
8256dae 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@ret2libc @nicman23
Linux 5.18 compat: blkg_tryget is moved to private headers
91be2a3 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@ret2libc @nicman23
Linux 5.18 compat: use address_space_operations->readahead
8f8b615 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@ret2libc @nicman23
Linux 5.18 compat: blkg_tryget is moved to private headers
0d8cc89 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@ret2libc @nicman23
Linux 5.18 compat: use address_space_operations->readahead
a25c888 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Sep 2, 2022
@ret2libc @lundman
Linux 5.18 compat: blkg_tryget is moved to private headers
14e7a40 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
lundman pushed a commit to openzfsonwindows/openzfs that referenced this pull request Sep 2, 2022
@ret2libc @lundman
Linux 5.18 compat: use address_space_operations->readahead
1b03df6 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
beren12 pushed a commit to beren12/zfs that referenced this pull request Sep 19, 2022
@ret2libc @beren12
Linux 5.18 compat: blkg_tryget is moved to private headers
b6dac36 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
beren12 pushed a commit to beren12/zfs that referenced this pull request Sep 19, 2022
@ret2libc @beren12
Linux 5.18 compat: use address_space_operations->readahead
d1221ed 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
a5a1cb0 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
38be131 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
13fbbc6 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
d2b2e00 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
26851cb 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
fcaa781 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
f42cbc0 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
6cab010 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
09987d0 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
f289f22 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
af47f7e 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
e4b4498 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
5c40bc2 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
0f31656 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
439bea8 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
a796c3a 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
2b958f2 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
e5126e0 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
02b6fc0 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
3121262 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
bca2732 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
99c2055 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
fdc39d9 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
ea7ec52 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
38549cd 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
fdf1a9e 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
34fcba1 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
6518ade 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
2c4789b 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
41139fe 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: blkg_tryget is moved to private headers
9a08ad8 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@ret2libc @andrewc12
Linux 5.18 compat: use address_space_operations->readahead
0b9ef9e 
->readpages was removed and replaced by ->readahead. Define
zpl_readahead for kernels that don't have ->readpages.

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Riccardo Schirone <[email protected]>
Closes openzfs#13278
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@behlendorf behlendorf behlendorf approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ret2libc @behlendorf