Skip to content
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

agent: s390x statfs constants #1561

Merged
merged 2 commits into from Apr 6, 2021

Conversation

Jakob-Naucke
Copy link
Member

Fixes: #1204
no backport required

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>
@GabyCT
Copy link
Contributor

GabyCT commented Mar 29, 2021

/test

@GabyCT
Copy link
Contributor

GabyCT commented Apr 6, 2021

/test-centos

@GabyCT
Copy link
Contributor

GabyCT commented Apr 6, 2021

/test-ubuntu

@GabyCT GabyCT merged commit aac852a into kata-containers:main Apr 6, 2021
@Jakob-Naucke Jakob-Naucke deleted the s390x-statfs-constants branch April 12, 2021 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Failure building kata-containers on s390x
3 participants