Add a rustix::fs::STATX_ATTR_MOUNT_ROOT constant.
#1198
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
JustSoup312
force-pushed
the
musl-statx-compat
branch
10 times, most recently
from
ca42248 to
aef0ca7
Compare
Add a `STATX_ATTR_MOUNT_ROOT` constant for musl libc compat
JustSoup312
force-pushed
the
musl-statx-compat
branch
from
aef0ca7 to
410f910
Compare
sunfishcode
reviewed
Oct 30, 2024
| #[cfg(all(linux_kernel, target_env = "musl"))] | ||
| pub(crate) const STATX_ATTR_MOUNT_ROOT: c_int = 0x2000; | ||
| #[cfg(all(linux_kernel, target_env = "gnu"))] | ||
| pub(crate) const STATX_ATTR_MOUNT_ROOT: c_int = libc::STATX_ATTR_MOUNT_ROOT; |
There was a problem hiding this comment.
This module does use libc::* at the top, so this line is unnecessary.
| AT_FDCWD, NFS_SUPER_MAGIC, O_LARGEFILE, PROC_SUPER_MAGIC, STATX_ATTR_MOUNT_ROOT, UTIME_NOW, | ||
| UTIME_OMIT, XATTR_CREATE, XATTR_REPLACE, | ||
| }; | ||
| #[cfg(not(any(target_env = "musl", target_env = "gnu")))] |
There was a problem hiding this comment.
The src/backend/linux_raw directory doesn't use libc bindings for most things, so we should be able to just add STATX_ATTR_MOUNT_ROOT to the use below instead of adding a new use here.
| @@ -10,6 +10,11 @@ use backend::fs::syscalls::statx as _statx; | |||
| #[cfg(not(feature = "linux_4_11"))] | |||
| use compat::statx as _statx; | |||
|
|
|||
| /// `STATX_ATTR_MOUNT_ROOT`—Address of the root of a mount | |||
| #[allow(dead_code)] | |||
There was a problem hiding this comment.
Since this is a pub const and re-exported in mod.rs, it shouldn't need allow(dead_code).
| @@ -116,6 +116,8 @@ pub use sendfile::sendfile; | |||
| pub use special::*; | |||
| #[cfg(linux_kernel)] | |||
| pub use statx::statx; | |||
| #[cfg(all(linux_kernel, any(target_env = "musl", target_env = "gnu")))] | |||
| pub use statx::STATX_ATTR_MOUNT_ROOT; | |||
There was a problem hiding this comment.
One thing we can do to make this code a little tidier is just change the use statx::statx above to be use statx::*;, instead of adding a new use, so that we don't have to repeat all the cfgs.
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.
Add a
STATX_ATTR_MOUNT_ROOTconstant for Linux with musl libc compatibility.(Note: This is my first contribution to rustix, so I assume that I may have placed const declarations in the wrong place. I will gladly fix any issues with this MR. Thank you!)