-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Linux 6.12 compat: Rename range_tree_* to zfs_range_tree_* #17010
Conversation
d4c51ca
to
95b8396
Compare
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.
This is incredibly invasive change. Wish there was some easier one, but whatever. Just a couple thoughts:
- I would not rename
metaslab_calculate_range_tree_type()
; - You are renaming some things in
range_tree.h
, but not others. Sure I don't want even more changes, just the logic looks inconsistent.
Yeah, the change was pretty mechanical, I literally ran: What did I miss in range_tree.h? I can definitely revert change to metaslab_calculate_range_tree_type. |
It's unfortunate it's so invasive, but if we're going to have to make this change let's be consistent about it and use |
a96bb37
to
68c8c24
Compare
I reverted renaming of metaslab_calculate_range_tree_type(), which was changed by mistake. |
Alternative to this change would be adding following lines to range_tree.h:
May be also add |
It's an interesting idea, but it does bring up the issues you mentioned. My vote is just to do the big rename. |
I should probably rebase and squash the commits. Let me know when I should do that. |
@IvanVolosyuk yes, please squash these commits. Could we get another reviewer to take a look at this? It looks nearly ready to go. |
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.
Thanks for this; the mix of prefixed vs unprefixed things across the codebase make my eye do a twitchy thing :)
I'd prefer the remaining things in range_tree.h
be converted, but also I know it sucks when these things drag on. So here's an approval, and a commit that I think does the remaining things: robn@7a3edae. Take it if you like, if not, I'll turn it into a PR to follow this one.
Good stuff!
Linux 6.12 has conflicting range_tree_{find,destroy,clear} symbols. Signed-off-by: Ivan Volosyuk <[email protected]>
Signed-off-by: Rob Norris <[email protected]>
68c8c24
to
dbdeeb8
Compare
@tonyhutter I squashed and pulled in @robn additional changes on top. |
@IvanVolosyuk thanks, looks good. |
"Waiting on 1 reapproval from someone other than the last pusher. Review from tonyhutter is stale because it was submitted before the most recent code changes." Looks like I need another approval or re-approval. @behlendorf may be? I don't know if @robn approval counts if I include his changes as well :) |
@robn any additional comments on this? If you're happy with it then I'll pull it in. |
@tonyhutter still good! ✔️ |
Linux 6.12 has conflicting range_tree_{find,destroy,clear} symbols.
Motivation and Context
Linux 6.12 introduced conflicting symbols which cause issues when compiling zfs with
--enable-linux-builtin
See #16932 for context.
The change fix compilation in this configuration.
Description
The change is basically:
find . -type f -exec sed -i 's/range_tree_/zfs_range_tree_/g' {} +
... and manually fixing lines > 80 characters to get checkstyle pass.
How Has This Been Tested?
No functional changes, linux kernel 6.12 with ZFS builtin compiled successfully.
Types of changes
Checklist:
Signed-off-by
.