Use Mkdev, Major and Minor functions from golang.org/x/sys/unix #1580
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
Update golang.org/x/sys to 314a259e304ff91bd6985da2a7149bbf91237993 Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
The SIGUNUSED constant was removed from golang.org/x/sys/unix in https://go-review.googlesource.com/61771 as it is also removed from the respective glibc headers. This means the command ctr tasks kill SIGUNUSED ... will no longer work. However, the same effect can be achieved with ctr tasks kill SIGSYS ... as SIGSYS has the same value as SIGUNUSED used to have. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Now that golang.org/x/sys/unix provides the Mkdev, Major and Minor functions for every OS, use them instead of the locally defined version which uses the Linux specific device major/minor encoding. This also means that the device number should now be properly encoded on e.g. Darwin, FreeBSD or Solaris. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Codecov Report
@@ Coverage Diff @@
## master #1580 +/- ##
=======================================
Coverage 42.36% 42.36%
=======================================
Files 24 24
Lines 3368 3368
=======================================
Hits 1427 1427
Misses 1612 1612
Partials 329 329Continue to review full report at Codecov.
|
|
LGTM |
|
Do we have to update this in continuity? https://github.com/containerd/continuity/tree/master/devices |
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.
Re-vendor golang.org/x/sys/unix in order to get the Mkdev, Major and Minor functions for every supported OS. Use these to get the proper device number encodings on all Unix-like OSes and remove the local Linux-specific versions of these functions.
Also remove usage of SIGUNUSED after the golang.org/x/sys update as it was removed upstream.