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

Jump to bottom

Linux 5.16 compat #12725

Closed
wants to merge 2 commits into from
Closed

Linux 5.16 compat #12725

wants to merge 2 commits into from

Conversation

behlendorf
Copy link
Contributor

@behlendorf behlendorf commented Nov 5, 2021 •
edited

Motivation and Context

Resolve new build failures introduced with the start of the 5.16 kernel
release cycle.

Description

  • Linux 5.16 compat: xgetbv()

    Explicitly include the xcr.h header for xgetbv(). It is no longer
    included indirectly resulting is a build failure.

  • Linux 5.16 compat: submit_bio()

    The submit_bio() prototype has changed again. The version is 5.16
    still only expects a single argument but the return type has changed
    to void. Since we never used the returned value before update the
    configure check to detect both single arg versions.

  • Linux 5.16 compat: linux/elevator.h

    Commit torvalds/linux@2e9bc346 moved
    the elevator.h header under the block/ directory as part of some
    refactoring. This turns out not to be a problem since there's
    no longer anything we need from the header. This has been the
    case for some time, this change removes the elevator.h include
    and replaces it with a major.h include.

Note: This commit does not yet address all needed 5.16 compat changes.

How Has This Been Tested?

Locally compiled with several older kernel versions. I'm depending
on the CI to check for build failures on a wider range of kernels.

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:

@behlendorf behlendorf added the Status: Code Review Needed Ready for review and testing label Nov 5, 2021
@behlendorf behlendorf added this to In progress in Linux via automation Nov 5, 2021
@behlendorf
Linux 5.16 compat: linux/elevator.h
c6bad70 
Commit torvalds/linux@2e9bc346 moved
the elevator.h header under the block/ directory as part of some
refactoring.  This turns out not to be a problem since there's
no longer anything we need from the header.  This has been the
case for some time, this change removes the elevator.h include
and replaces it with a major.h include.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
@tonyhutter tonyhutter mentioned this pull request Nov 5, 2021
Merged
13 tasks
@behlendorf
Linux 5.16 compat: submit_bio()
3c9395d 
The submit_bio() prototype has changed again.  The version is 5.16
still only expects a single argument but the return type has changed
to void.  Since we never used the returned value before update the
configure check to detect both single arg versions.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
@behlendorf behlendorf added the Status: Work in Progress Not yet ready for general review label Nov 6, 2021
@behlendorf behlendorf changed the title Linux 5.16 compat: linux/elevator.h Linux 5.16 compat Nov 6, 2021
solbjorn
solbjorn reviewed Nov 8, 2021
View reviewed changes
Copy link
Contributor

@solbjorn solbjorn left a comment

Choose a reason for hiding this comment

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

Nice!

Reviewed-by: Alexander Lobakin <alobakin@pm.me>

@behlendorf behlendorf closed this in 1e7d634 Nov 9, 2021
behlendorf added a commit that referenced this pull request Nov 9, 2021
@behlendorf
Linux 5.16 compat: submit_bio()
453c63e 
The submit_bio() prototype has changed again.  The version is 5.16
still only expects a single argument but the return type has changed
to void.  Since we never used the returned value before update the
configure check to detect both single arg versions.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Alexander Lobakin <alobakin@pm.me>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #12725
Linux automation moved this from In progress to Done Nov 9, 2021
@behlendorf behlendorf added Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Work in Progress Not yet ready for general review Status: Code Review Needed Ready for review and testing labels Nov 9, 2021
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Nov 10, 2021
@behlendorf @tonyhutter
Linux 5.16 compat: linux/elevator.h
0e537a0 
Commit torvalds/linux@2e9bc346 moved
the elevator.h header under the block/ directory as part of some
refactoring.  This turns out not to be a problem since there's
no longer anything we need from the header.  This has been the
case for some time, this change removes the elevator.h include
and replaces it with a major.h include.

Reviewed-by: Alexander Lobakin <alobakin@pm.me>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#12725
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Nov 10, 2021
@behlendorf @tonyhutter
Linux 5.16 compat: submit_bio()
22b0891 
The submit_bio() prototype has changed again.  The version is 5.16
still only expects a single argument but the return type has changed
to void.  Since we never used the returned value before update the
configure check to detect both single arg versions.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Alexander Lobakin <alobakin@pm.me>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#12725
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Nov 10, 2021
@behlendorf @tonyhutter
Linux 5.16 compat: linux/elevator.h
2a4a2ea 
Commit torvalds/linux@2e9bc346 moved
the elevator.h header under the block/ directory as part of some
refactoring.  This turns out not to be a problem since there's
no longer anything we need from the header.  This has been the
case for some time, this change removes the elevator.h include
and replaces it with a major.h include.

Reviewed-by: Alexander Lobakin <alobakin@pm.me>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#12725
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Nov 10, 2021
@behlendorf @tonyhutter
Linux 5.16 compat: submit_bio()
d92a1c4 
The submit_bio() prototype has changed again.  The version is 5.16
still only expects a single argument but the return type has changed
to void.  Since we never used the returned value before update the
configure check to detect both single arg versions.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Alexander Lobakin <alobakin@pm.me>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#12725
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Nov 13, 2021
@behlendorf @tonyhutter
Linux 5.16 compat: linux/elevator.h
4e888a9 
Commit torvalds/linux@2e9bc346 moved
the elevator.h header under the block/ directory as part of some
refactoring.  This turns out not to be a problem since there's
no longer anything we need from the header.  This has been the
case for some time, this change removes the elevator.h include
and replaces it with a major.h include.

Reviewed-by: Alexander Lobakin <alobakin@pm.me>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#12725
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Nov 13, 2021
@behlendorf @tonyhutter
Linux 5.16 compat: submit_bio()
dd2f039 
The submit_bio() prototype has changed again.  The version is 5.16
still only expects a single argument but the return type has changed
to void.  Since we never used the returned value before update the
configure check to detect both single arg versions.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Alexander Lobakin <alobakin@pm.me>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#12725
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Nov 13, 2021
@behlendorf @tonyhutter
Linux 5.16 compat: linux/elevator.h
b8b3b93 
Commit torvalds/linux@2e9bc346 moved
the elevator.h header under the block/ directory as part of some
refactoring.  This turns out not to be a problem since there's
no longer anything we need from the header.  This has been the
case for some time, this change removes the elevator.h include
and replaces it with a major.h include.

Reviewed-by: Alexander Lobakin <alobakin@pm.me>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#12725
tonyhutter pushed a commit to tonyhutter/zfs that referenced this pull request Nov 13, 2021
@behlendorf @tonyhutter
Linux 5.16 compat: submit_bio()
6de5c44 
The submit_bio() prototype has changed again.  The version is 5.16
still only expects a single argument but the return type has changed
to void.  Since we never used the returned value before update the
configure check to detect both single arg versions.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Alexander Lobakin <alobakin@pm.me>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes openzfs#12725
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@solbjorn solbjorn solbjorn left review comments

@tonyhutter tonyhutter tonyhutter approved these changes

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@behlendorf @tonyhutter @solbjorn