diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-02-21 00:27:00 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-02-21 00:27:00 +0000 |
commit | 11cbf743265a24bbdde750f44bd4f56ac66ff9d2 (patch) | |
tree | 161dc80318a8e7add9b134ff968175361fd2c657 /pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go | |
parent | f7f6b5ae0fad1f5bfd050b3b290e63efc83d7a28 (diff) | |
parent | f1b72752e5de2abc3c409a6b7447224620b7c11b (diff) |
Merge release-20200211.0-58-gf1b7275 (automated)
Diffstat (limited to 'pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go')
-rwxr-xr-x | pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go b/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go index cefe4941a..6abfea58c 100755 --- a/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go +++ b/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go @@ -62,21 +62,21 @@ func (s *Stat) MarshalBytes(dst []byte) { // UnmarshalBytes implements marshal.Marshallable.UnmarshalBytes. func (s *Stat) UnmarshalBytes(src []byte) { - s.Dev = usermem.ByteOrder.Uint64(src[:8]) + s.Dev = uint64(usermem.ByteOrder.Uint64(src[:8])) src = src[8:] - s.Ino = usermem.ByteOrder.Uint64(src[:8]) + s.Ino = uint64(usermem.ByteOrder.Uint64(src[:8])) src = src[8:] - s.Nlink = usermem.ByteOrder.Uint64(src[:8]) + s.Nlink = uint64(usermem.ByteOrder.Uint64(src[:8])) src = src[8:] - s.Mode = usermem.ByteOrder.Uint32(src[:4]) + s.Mode = uint32(usermem.ByteOrder.Uint32(src[:4])) src = src[4:] - s.UID = usermem.ByteOrder.Uint32(src[:4]) + s.UID = uint32(usermem.ByteOrder.Uint32(src[:4])) src = src[4:] - s.GID = usermem.ByteOrder.Uint32(src[:4]) + s.GID = uint32(usermem.ByteOrder.Uint32(src[:4])) src = src[4:] // Padding: var _ int32 ~= src[:sizeof(int32)] src = src[4:] - s.Rdev = usermem.ByteOrder.Uint64(src[:8]) + s.Rdev = uint64(usermem.ByteOrder.Uint64(src[:8])) src = src[8:] s.Size = int64(usermem.ByteOrder.Uint64(src[:8])) src = src[8:] @@ -101,7 +101,7 @@ func (s *Stat) Packed() bool { // MarshalUnsafe implements marshal.Marshallable.MarshalUnsafe. func (s *Stat) MarshalUnsafe(dst []byte) { - if s.ATime.Packed() && s.MTime.Packed() && s.CTime.Packed() { + if s.MTime.Packed() && s.CTime.Packed() && s.ATime.Packed() { safecopy.CopyIn(dst, unsafe.Pointer(s)) } else { s.MarshalBytes(dst) @@ -119,7 +119,7 @@ func (s *Stat) UnmarshalUnsafe(src []byte) { // CopyOut implements marshal.Marshallable.CopyOut. func (s *Stat) CopyOut(task marshal.Task, addr usermem.Addr) error { - if !s.ATime.Packed() && s.MTime.Packed() && s.CTime.Packed() { + if !s.CTime.Packed() && s.ATime.Packed() && s.MTime.Packed() { // Type Stat doesn't have a packed layout in memory, fall back to MarshalBytes. buf := task.CopyScratchBuffer(s.SizeBytes()) s.MarshalBytes(buf) @@ -184,7 +184,7 @@ func (s *Stat) CopyIn(task marshal.Task, addr usermem.Addr) error { // WriteTo implements io.WriterTo.WriteTo. func (s *Stat) WriteTo(w io.Writer) (int64, error) { - if !s.CTime.Packed() && s.ATime.Packed() && s.MTime.Packed() { + if !s.ATime.Packed() && s.MTime.Packed() && s.CTime.Packed() { // Type Stat doesn't have a packed layout in memory, fall back to MarshalBytes. buf := make([]byte, s.SizeBytes()) s.MarshalBytes(buf) |