Backport 5.12 fixes for tmpiles and userns changes #12139
Merged
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
|
Can you make these changes against the |
Linux changed the tmpfile() signature again in torvalds/linux@6521f89, which in turn broke our HAVE_TMPFILE detection in configure. Update that macro to include the new case, and change the signature of zpl_tmpfile as appropriate. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rich Ercolani <rincebrain@gmail.com> Closes: openzfs#12060 Closes: openzfs#12087
Just like openzfs#12087, the set_acl signature changed with all the bolted-on *userns parameters, which disabled set_acl usage, and caused openzfs#12076. Turn zpl_set_acl into zpl_set_acl and zpl_set_acl_impl, and add a new configure test for the new version. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rich Ercolani <rincebrain@gmail.com> Closes openzfs#12076 Closes openzfs#12093
|
I hope they still end up in the next 2.1 rc/release? |
|
The commits look good. I'm just waiting on the builders to finish to approve. We don't have a -staging branch for 2.1 yet since it's going though -rc iterations. @behlendorf can you include this in 2.1.0-rc6? |
|
I can still reproduce the issue from #12076 with those two commits backported into 2.1, so I'd assume this also isn't enough to fix 2.0. Not sure what's missing though. Edit: Disregard this, the ebuild is just not running autoreconf after applying the patches. |
tonyhutter
approved these changes
May 28, 2021
jonathonf
added a commit
to jonathonf/pkgbuilds
that referenced
this pull request
May 28, 2021
This includes two further approved backport PRs for the zfs-2.0.5-staging branch (openzfs/zfs#12139, openzfs/zfs#12141) and switches compat patches from 12009 to the merged commits.
jonathonf
added a commit
to jonathonf/pkgbuilds
that referenced
this pull request
May 30, 2021
This includes two further approved backport PRs for the zfs-2.0.5-staging branch (openzfs/zfs#12139, openzfs/zfs#12141) and switches compat patches from 12009 to the merged commits. It also includes bugfix openzfs/zfs#12155 .
jonathonf
added a commit
to jonathonf/pkgbuilds
that referenced
this pull request
May 30, 2021
This includes two further approved backport PRs for the zfs-2.0.5-staging branch (openzfs/zfs#12139, openzfs/zfs#12141) and switches compat patches from 12009 to the merged commits. It also includes bugfix openzfs/zfs#12155 .
jonathonf
added a commit
to jonathonf/pkgbuilds
that referenced
this pull request
Jun 1, 2021
This includes two further approved backport PRs for the zfs-2.0.5-staging branch (openzfs/zfs#12139, openzfs/zfs#12141) and switches compat patches from 12009 to the merged commits. It also includes backported bugfix openzfs/zfs#12178 .
jonathonf
added a commit
to jonathonf/pkgbuilds
that referenced
this pull request
Jun 1, 2021
This includes two further approved backport PRs for the zfs-2.0.5-staging branch (openzfs/zfs#12139, openzfs/zfs#12141) and switches compat patches from 12009 to the merged commits. It also includes backported bugfix openzfs/zfs#12178 .
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.
This backports the changes made in #12087 and #12093, which are necessary for proper 5.12 compat and are thus critical to have for a release that claims to be compatible with 5.12.