diff options
author | gVisor bot <gvisor-bot@google.com> | 2020-06-01 21:58:31 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2020-06-01 21:58:31 +0000 |
commit | a5ff9164eb283d99a2e66428267b01bb0c23ba46 (patch) | |
tree | ec03fea4241eca36832bb6c0afaf1b7f9a425211 /pkg | |
parent | 91a529403d2b16bfe8f6cfba393d3dd36853ef37 (diff) | |
parent | 6ef5924725812f5885880cf57821fe2cd49b808d (diff) |
Merge release-20200522.0-54-g6ef59247 (automated)
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/abi/linux/linux_abi_autogen_unsafe.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/abi/linux/linux_abi_autogen_unsafe.go b/pkg/abi/linux/linux_abi_autogen_unsafe.go index 049c283c1..f18f8a0e2 100644 --- a/pkg/abi/linux/linux_abi_autogen_unsafe.go +++ b/pkg/abi/linux/linux_abi_autogen_unsafe.go @@ -124,12 +124,12 @@ func (s *Statx) UnmarshalBytes(src []byte) { // Packed implements marshal.Marshallable.Packed. //go:nosplit func (s *Statx) Packed() bool { - return s.Ctime.Packed() && s.Mtime.Packed() && s.Atime.Packed() && s.Btime.Packed() + return s.Atime.Packed() && s.Btime.Packed() && s.Ctime.Packed() && s.Mtime.Packed() } // MarshalUnsafe implements marshal.Marshallable.MarshalUnsafe. func (s *Statx) MarshalUnsafe(dst []byte) { - if s.Atime.Packed() && s.Btime.Packed() && s.Ctime.Packed() && s.Mtime.Packed() { + if s.Btime.Packed() && s.Ctime.Packed() && s.Mtime.Packed() && s.Atime.Packed() { safecopy.CopyIn(dst, unsafe.Pointer(s)) } else { s.MarshalBytes(dst) |