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

Remove s390x exemptions from sys::statfs MAGIC constants #1372

Merged
merged 1 commit into from Feb 7, 2021
Merged

Remove s390x exemptions from sys::statfs MAGIC constants #1372

merged 1 commit into from Feb 7, 2021

Conversation

Jakob-Naucke
Copy link
Contributor

@Jakob-Naucke Jakob-Naucke commented Jan 8, 2021

Since rust-lang/libc is now using the correct data type on s390x (c_uint) for
statfs constants, the s390x exemptions in the statfs MAGIC definitions like
EXT4_SUPER_MAGIC can be removed.

Signed-off-by: Jakob Naucke jakob.naucke@ibm.com

CHANGELOG.md Outdated
@@ -10,6 +10,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Added limited Fuchsia support (#[1285](https://github.com/nix-rust/nix/pull/1285))
- Added `getpeereid` (#[1342](https://github.com/nix-rust/nix/pull/1342))
### Fixed
- Removed s390x exemptions from `nix::sys::statfs` `MAGIC` constants, since the corresponding types in `libc` have been corrected.
Copy link
Member

@asomers asomers Jan 31, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about "Define *_MAGIC constants on Linux s390x", and include a PR link?

Copy link
Contributor Author

@Jakob-Naucke Jakob-Naucke Feb 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure! Have updated accordingly.

CHANGELOG.md Outdated
@@ -10,6 +10,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Added limited Fuchsia support (#[1285](https://github.com/nix-rust/nix/pull/1285))
- Added `getpeereid` (#[1342](https://github.com/nix-rust/nix/pull/1342))
### Fixed
- Define `*_MAGIC` filesystem constants on Linux s390x (#[1372](https://github.com/nix-rust/nix/pull/1342))
Copy link
Member

@asomers asomers Feb 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops! Looks like a copy/paste error here.

Copy link
Contributor Author

@Jakob-Naucke Jakob-Naucke Feb 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops indeed! Updated.

Since rust-lang/libc is now using the correct data type on s390x (c_uint) for
statfs constants, the s390x exemptions in the statfs MAGIC definitions like
EXT4_SUPER_MAGIC can be removed.

Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
@Jakob-Naucke
Copy link
Contributor Author

Jakob-Naucke commented Feb 2, 2021

Double whoops, reset to a commit that was even with upstream, which closed the pull request. Sorry!

@Jakob-Naucke Jakob-Naucke reopened this Feb 2, 2021
asomers
asomers approved these changes Feb 7, 2021
Copy link
Member

@asomers asomers left a comment

bors r+

@bors bors bot merged commit e7c7021 into nix-rust:master Feb 7, 2021
30 checks passed
@Jakob-Naucke Jakob-Naucke mentioned this pull request Feb 9, 2021
Jakob-Naucke added a commit to Jakob-Naucke/kata-containers that referenced this issue Mar 29, 2021
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>
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.

None yet

2 participants