Merge pull request #3501 from wanghuaiqing2010/master

crosbymichael · web-flow · commit 1eb13fc2f008 · 2019-08-08T10:27:52.000-04:00
cast Rdev of Stat_t to uint64 for mips
diff --git a/oci/spec_opts_linux.go b/oci/spec_opts_linux.go
@@ -32,7 +32,8 @@ func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {
 	}
 
 	var (
-		devNumber = stat.Rdev
+		// The type is 32bit on mips.
+		devNumber = uint64(stat.Rdev) // nolint: unconvert
 		major     = unix.Major(devNumber)
 		minor     = unix.Minor(devNumber)
 	)

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`var (`
`35`		`- devNumber = stat.Rdev`
	`35`	`+ // The type is 32bit on mips.`
	`36`	`+ devNumber = uint64(stat.Rdev) // nolint: unconvert`
`36`	`37`	`major = unix.Major(devNumber)`
`37`	`38`	`minor = unix.Minor(devNumber)`
`38`	`39`	`)`