-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
[backport] Kernel 5.12 compat patches for 2.0.* #12009
Merged
behlendorf
merged 2 commits into
openzfs:zfs-2.0.5-staging
from
jonathonf:zfs-2.0.5-staging-5.12-compat
May 20, 2021
Merged
[backport] Kernel 5.12 compat patches for 2.0.* #12009
behlendorf
merged 2 commits into
openzfs:zfs-2.0.5-staging
from
jonathonf:zfs-2.0.5-staging-5.12-compat
May 20, 2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In Linux 5.12, the filesystem API was modified to support ipmapped mounts by adding a "struct user_namespace *" parameter to a number functions and VFS handlers. This change adds the needed autoconf macros to detect the new interfaces and updates the code appropriately. This change does not add support for idmapped mounts, instead it preserves the existing behavior by passing the initial user namespace where needed. A subsequent commit will be required to add support for idmapped mounted. Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Co-authored-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Coleman Kane <ckane@colemankane.org> Closes #11712 (cherry picked from commit e2a8296) Signed-off-by: Jonathon Fernyhough <jonathon@m2x.dev>
The BIO_MAX_PAGES macro is being retired in favor of a bio_max_segs() function that implements the typical MIN(x,y) logic used throughout the kernel for bounding the allocation, and also the new implementation is intended to be signed-safe (which the former was not). Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Coleman Kane <ckane@colemankane.org> Closes #11765 (cherry picked from commit ffd6978) Signed-off-by: Jonathon Fernyhough <jonathon@m2x.dev>
tonyhutter
approved these changes
May 7, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for these backports!
behlendorf
approved these changes
May 7, 2021
10 tasks
This was referenced May 28, 2021
zer0def
pushed a commit
to zer0def/PKGBUILDs
that referenced
this pull request
Sep 10, 2021
Backport kernel 5.12 compat and update patches This backports the upstream compat patches openzfs/zfs@e2a8296 and openzfs/zfs@ffd6978 via openzfs/zfs#12009 Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
This PR backports two additional compat patches necessary for kernel 5.12 support for the 2.0.* series.
Description
This cherry-picks both e2a8296 and ffd6978 for kernel 5.12 compatibility.
How Has This Been Tested?
This has been tested on several systems running Arch Linux and kernels 5.12.0 and 5.12.1 using the PR eli-schwartz/pkgbuilds#24 (which will be updated pending this PR).
Types of changes
Checklist:
Signed-off-by
.