Simple change to fix building in recent environments. #12059
Merged
Conversation
This file contains hidden or 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
module/os/linux/zfs/zfs_ioctl_os.c
Outdated
| @@ -264,7 +264,7 @@ _fini(void) | |||
| } | |||
|
|
|||
| #if defined(_KERNEL) | |||
| module_init(_init); | |||
| module_init(openzfs_init); | |||
| module_exit(_fini); | |||
There was a problem hiding this comment.
it'd probably be best to rename _fini, too, for symmetry
There was a problem hiding this comment.
Sounds reasonable to me. Hopefully the buildbots don't report I somehow ruined everything.
behlendorf
approved these changes
May 17, 2021
tonynguien
approved these changes
May 17, 2021
Renamed _fini too for symmetry. Closes: openzfs#11987 Closes: openzfs#12056 Suggested-by: @ensch Signed-off-by: Rich Ercolani <[email protected]>
rincebrain
force-pushed
the
simple_init_change
branch
from
8377164 to
ef0ecd4
Compare
behlendorf
pushed a commit
to behlendorf/zfs
that referenced
this pull request
May 28, 2021
Renamed _fini too for symmetry. Suggested-by: @ensch Reviewed-by: Tony Nguyen <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Rich Ercolani <[email protected]> Closes openzfs#12059 Closes: openzfs#11987 Closes: openzfs#12056
sempervictus
pushed a commit
to sempervictus/zfs
that referenced
this pull request
May 31, 2021
Renamed _fini too for symmetry. Suggested-by: @ensch Reviewed-by: Tony Nguyen <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Rich Ercolani <[email protected]> Closes openzfs#12059 Closes: openzfs#11987 Closes: openzfs#12056
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Jun 10, 2021
Renamed _fini too for symmetry. Suggested-by: @ensch Reviewed-by: Tony Nguyen <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Rich Ercolani <[email protected]> Closes openzfs#12059 Closes: openzfs#11987 Closes: openzfs#12056
tonyhutter
pushed a commit
that referenced
this pull request
Jun 23, 2021
Renamed _fini too for symmetry. Suggested-by: @ensch Reviewed-by: Tony Nguyen <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Rich Ercolani <[email protected]> Closes #12059 Closes: #11987 Closes: #12056
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
Quick change that was the sole thing required to unbreak building with 5.12.4.
Description
Per @ensch:
Just renaming the _init function to something else, so that the macro expansion does not confuse it with __init, fixes the problem for me.How Has This Been Tested?
It built with bb-build-linux.sh. That's all I've tried.
Types of changes
Checklist:
Signed-off-by.