Remove s390x exemptions from sys::statfs MAGIC constants #1372
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
asomers
requested changes
Jan 31, 2021
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. | |||
There was a problem hiding this comment.
How about "Define *_MAGIC constants on Linux s390x", and include a PR link?
There was a problem hiding this comment.
Sure! Have updated accordingly.
asomers
reviewed
Feb 2, 2021
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)) | |||
There was a problem hiding this comment.
Whoops! Looks like a copy/paste error here.
There was a problem hiding this comment.
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 <[email protected]>
|
Double whoops, reset to a commit that was even with upstream, which closed the pull request. Sorry! |
Closed
This was referenced Mar 12, 2021
Jakob-Naucke
added a commit
to Jakob-Naucke/kata-containers
that referenced
this pull request
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 <[email protected]>
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.
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 [email protected]