[WIP] linux 4.11 compat: avoid refcount_t name conflict #5842
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
ofaaland
force-pushed
the
b_refcount_t
branch
from
a186ade
to
f1b730a
Compare
Linux 4.11 introduces a new type, refcount_t, which conflicts with the type of the same name defined within ZFS. Rename the ZFS type zfs_refcount_t. Within the ZFS code, use a macro to cause references to refcount_t to be changed to zfs_refcount_t at compile time. This reduces conflicts when later landing OpenZFS patches. Fixes openzfs#5823 Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
ofaaland
force-pushed
the
b_refcount_t
branch
from
f1b730a
to
8a4fe52
Compare
behlendorf
approved these changes
Feb 28, 2017
behlendorf
added
Type: Building
dinatale2
approved these changes
Feb 28, 2017
gmelikov
approved these changes
Feb 28, 2017
|
To be honest, I don't like this kind of macro game very much. If you're not careful about the include order, it's very easy to accidentally modify the kernel header and cause some strange thing. We did this kind of thing with kmem_cache thing, but kmem_cache object and function are rarely used inside kernel header files so it's arguably not a big deal. However, you can't say the same thing for refcount_t, it's definitely going to be used in a lot of header files. |
|
The long term plan discussed at the OpenZFS dev summit would be to add a prefix, maybe |
l1k
pushed a commit
to l1k/zfs
that referenced
this pull request
Apr 17, 2017
Linux 4.11 introduces a new type, refcount_t, which conflicts with the type of the same name defined within ZFS. Rename the ZFS type zfs_refcount_t. Within the ZFS code, use a macro to cause references to refcount_t to be changed to zfs_refcount_t at compile time. This reduces conflicts when later landing OpenZFS patches. Reviewed-by: George Melikov <mail@gmelikov.ru> Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Olaf Faaland <faaland1@llnl.gov> Closes openzfs#5823 Closes openzfs#5842
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
May 18, 2017
Linux 4.11 introduces a new type, refcount_t, which conflicts with the type of the same name defined within ZFS. Rename the ZFS type zfs_refcount_t. Within the ZFS code, use a macro to cause references to refcount_t to be changed to zfs_refcount_t at compile time. This reduces conflicts when later landing OpenZFS patches. Reviewed-by: George Melikov <mail@gmelikov.ru> Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Olaf Faaland <faaland1@llnl.gov> Closes openzfs#5823 Closes openzfs#5842
tonyhutter
pushed a commit
that referenced
this pull request
Jun 9, 2017
Linux 4.11 introduces a new type, refcount_t, which conflicts with the type of the same name defined within ZFS. Rename the ZFS type zfs_refcount_t. Within the ZFS code, use a macro to cause references to refcount_t to be changed to zfs_refcount_t at compile time. This reduces conflicts when later landing OpenZFS patches. Reviewed-by: George Melikov <mail@gmelikov.ru> Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Olaf Faaland <faaland1@llnl.gov> Closes #5823 Closes #5842
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.
Description
Rename the ZFS type refcount_t to zfs_refcount_t.
Rather than touching all the ZFS code that uses refcount_t, use a preprocessor
macro to rename the type at compile time to zfs_refcount_t. The ZFS code
never refers to the linux type with the conflicting name so this does not break
anything.
Similarly rename refcount_add() which also conflicts.
Motivation and Context
Linux 4.11 introduces a new type, refcount_t, which conflicts with the
type of the same name defined within ZFS. The build fails when building
against that kernel or later.
Issue #5823
How Has This Been Tested?
Built and ran ztest on my desktop.
Types of changes
Checklist: