Declare statfs MAGIC constants as c_uint on s390x #1999
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. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
Makes sense!
You could use |
Previously, statfs MAGIC constants like EXT4_SUPER_MAGIC were defined as c_long for linux-gnu, whereas a statfs f_type is a c_uint on s390x. This commit exempts these definitions from s390x and instead defines these constants as c_uint on s390x. This is safe as none of these constants are wider than 32bit. Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
|
@JohnTitor more like this? |
Yeah, thanks! @bors r+ |
|
📌 Commit 3d09b9f has been approved by |
|
☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13 |
|
Awesome, thank you! It would be good for this fix to be released to fix Kata Containers on s390x. @JohnTitor can I create a bump or do you feel the change is too insignificant? |
|
@Jakob-Naucke You can create a PR to make a release following the contributing guide: https://github.com/rust-lang/libc/blob/master/CONTRIBUTING.md#releasing-your-change-to-cratesio |
to pull in the chain of rust-lang/libc#1999, nix-rust/nix#1372, and kata-containers/cgroups-rs#38. This adds statfs constants on s390x. cgroups-rs 0.2.4 also contains this fix, but let's move to the latest 0.2.5 right away. Fixes: kata-containers#1204 Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
statfs f_types are long on most architectures, but not on s390x, where they are uint. Following the fix in rust-lang/libc at rust-lang/libc#1999, the custom defined PROC_SUPER_MAGIC must be updated in a similar way. Fixes: kata-containers#1204 Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
Hi, I work in container development on Linux on Z at IBM.
On s390x (IBM Z) in GNU/Linux, a statfs
f_typeis 4 bytes wide, contrary to 8 bytes on most architectures.This is already implemented in libc:
However, the
*_MAGICconstants (such asEXT4_SUPER_MAGIC) insrc/unix/linux_like/linux/gnu/mod.rsare defined asc_long, when they should bec_uinton s390x.This ends up biting me here.
Thus, I suggest the attached change to only define these constants for architectures other than s390x and instead define them as uint for s390x.
This is safe since none of the constants are any wider than 32bit.
Please let me know if you think this could be done more elegantly.