diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-02-27 22:54:51 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-02-27 22:54:51 +0000 |
commit | 92c73f020c0e147788a7867f8133701b5bb9e9bf (patch) | |
tree | 0be1f695cff4a5af3366f6ba992a6eb92d4af2be /pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go | |
parent | 5ec8b393826ef0eb794f23c8f9ae72aaec1a88a7 (diff) | |
parent | aa9f8abaef5c6250bdcee8fd88b2420f20791c5d (diff) |
Merge release-20200219.0-61-gaa9f8ab (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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go b/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go index bbfe76aa0..aa5afa819 100755 --- a/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go +++ b/pkg/abi/linux/linux_amd64_abi_autogen_unsafe.go @@ -206,12 +206,12 @@ func (s *Stat) UnmarshalBytes(src []byte) { // Packed implements marshal.Marshallable.Packed. func (s *Stat) Packed() bool { - return s.ATime.Packed() && s.MTime.Packed() && s.CTime.Packed() + return s.CTime.Packed() && s.ATime.Packed() && s.MTime.Packed() } // 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) @@ -260,7 +260,7 @@ func (s *Stat) CopyOut(task marshal.Task, addr usermem.Addr) error { // CopyIn implements marshal.Marshallable.CopyIn. func (s *Stat) CopyIn(task marshal.Task, addr usermem.Addr) error { - if !s.MTime.Packed() && s.CTime.Packed() && s.ATime.Packed() { + if !s.ATime.Packed() && s.MTime.Packed() && s.CTime.Packed() { // Type Stat doesn't have a packed layout in memory, fall back to UnmarshalBytes. buf := task.CopyScratchBuffer(s.SizeBytes()) _, err := task.CopyInBytes(addr, buf) |