-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Add ioctl FS_IOC_{G,S}ETVERSION and FS_IOC_{G,S}ETFLAGS #3089
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
Conversation
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) soon. Please see the contribution instructions for more information. |
Seems the values are different on i686-unknown-linux-gnu. |
Indeed, I fail to expand the macros, I did so for all the supported arch now |
// where S stands for size (int, long, struct...) | ||
// where T stands for type ('f','v','X'...) | ||
// where N stands for NR (NumbeR) | ||
if #[cfg(any(target_arch = "x86"))] { |
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 any
doesn't do anything and should go to an arch-specific file.
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.
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.
Uhm I don't see an arch specific for x86 and x86_64 thus why I added them to generic, note sparc, powerpc and mips which are all the arch specific supported by libc for linux-like are covered so by doing so I think all case are covered.
The superfluous any were removed
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.
You could make a new module like mips
. This structure is for arch-dependent declarations and using cfgs with target_arch
would lose the meaning here.
☔ The latest upstream changes (presumably #3109) made this pull request unmergeable. Please resolve the merge conflicts. |
Could you also fix the merge conflict and squash commits into one? |
37580ce
to
ba38ebc
Compare
ba38ebc
to
011c1e1
Compare
Done |
Sorry for the delay! @bors r+ |
Add ioctl FS_IOC_{G,S}ETVERSION and FS_IOC_{G,S}ETFLAGS This PR focus on adding support for the constants behind the call of ioctl(FS_IOC_G/SETFLAGS) and ioctl(FS_IOC_G/SETVERSION) Ressources: Linux: https://elixir.bootlin.com/linux/latest/source/include/uapi/linux/fs.h#L220 Android: https://cs.android.com/android/platform/superproject/+/master:prebuilts/vndk/v31/arm/include/bionic/libc/kernel/uapi/linux/fs.h;l=155?q=FS_APPEND_FL&ss=android%2Fplatform%2Fsuperproject Android (bis): https://cs.android.com/android/platform/superproject/+/master:bionic/libc/kernel/uapi/linux/fs.h;l=161;drc=4794e479f4b485be2680e83993e3cf93f0f42d03?q=FS_APPEND_FL&sq=&ss=android%2Fplatform%2Fsuperproject Note: Thoses calls are a bit of a mess historically, however the constants did not change since
💔 Test failed - checks-actions |
Could we retry this please? The CI logs have expired so we can't know what went wrong. |
@bors retry |
Looks like this is stuck in Bors queue @JohnTitor |
@bors retry |
@fsavy-tehtris: 🔑 Insufficient privileges: not in try users |
@bors retry |
Add ioctl FS_IOC_{G,S}ETVERSION and FS_IOC_{G,S}ETFLAGS This PR focus on adding support for the constants behind the call of ioctl(FS_IOC_G/SETFLAGS) and ioctl(FS_IOC_G/SETVERSION) Ressources: Linux: https://elixir.bootlin.com/linux/latest/source/include/uapi/linux/fs.h#L220 Android: https://cs.android.com/android/platform/superproject/+/master:prebuilts/vndk/v31/arm/include/bionic/libc/kernel/uapi/linux/fs.h;l=155?q=FS_APPEND_FL&ss=android%2Fplatform%2Fsuperproject Android (bis): https://cs.android.com/android/platform/superproject/+/master:bionic/libc/kernel/uapi/linux/fs.h;l=161;drc=4794e479f4b485be2680e83993e3cf93f0f42d03?q=FS_APPEND_FL&sq=&ss=android%2Fplatform%2Fsuperproject Note: Thoses calls are a bit of a mess historically, however the constants did not change since
💔 Test failed - checks-actions |
Add ioctl FS_IOC_* version and flag constants This is a tentative to fix #3089 because the original author is unlikely to revisit it. I've added the missing architectures for the constants on Linux, I think they should all be covered now.
Add ioctl FS_IOC_* version and flag constants This is a tentative to fix #3089 because the original author is unlikely to revisit it. I've added the missing architectures for the constants on Linux, I think they should all be covered now.
Add ioctl FS_IOC_{G,S}ETVERSION and FS_IOC_{G,S}ETFLAGS This PR focus on adding support for the constants behind the call of ioctl(FS_IOC_G/SETFLAGS) and ioctl(FS_IOC_G/SETVERSION) Ressources: Linux: https://elixir.bootlin.com/linux/latest/source/include/uapi/linux/fs.h#L220 Android: https://cs.android.com/android/platform/superproject/+/master:prebuilts/vndk/v31/arm/include/bionic/libc/kernel/uapi/linux/fs.h;l=155?q=FS_APPEND_FL&ss=android%2Fplatform%2Fsuperproject Android (bis): https://cs.android.com/android/platform/superproject/+/master:bionic/libc/kernel/uapi/linux/fs.h;l=161;drc=4794e479f4b485be2680e83993e3cf93f0f42d03?q=FS_APPEND_FL&sq=&ss=android%2Fplatform%2Fsuperproject Note: Thoses calls are a bit of a mess historically, however the constants did not change since
@bors retry r- |
Superseded by #3396, thanks anyway! |
Add ioctl FS_IOC_* version and flag constants This is a tentative to fix #3089 because the original author is unlikely to revisit it. I've added the missing architectures for the constants on Linux, I think they should all be covered now.
Add ioctl FS_IOC_* version and flag constants This is a tentative to fix #3089 because the original author is unlikely to revisit it. I've added the missing architectures for the constants on Linux, I think they should all be covered now.
This PR focus on adding support for the constants behind the call of ioctl(FS_IOC_G/SETFLAGS) and ioctl(FS_IOC_G/SETVERSION)
Ressources:
Linux: https://elixir.bootlin.com/linux/latest/source/include/uapi/linux/fs.h#L220
Android: https://cs.android.com/android/platform/superproject/+/master:prebuilts/vndk/v31/arm/include/bionic/libc/kernel/uapi/linux/fs.h;l=155?q=FS_APPEND_FL&ss=android%2Fplatform%2Fsuperproject
Android (bis): https://cs.android.com/android/platform/superproject/+/master:bionic/libc/kernel/uapi/linux/fs.h;l=161;drc=4794e479f4b485be2680e83993e3cf93f0f42d03?q=FS_APPEND_FL&sq=&ss=android%2Fplatform%2Fsuperproject
Note: Thoses calls are a bit of a mess historically, however the constants did not change since