summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-07-06 19:17:37 +0000
committergVisor bot <gvisor-bot@google.com>2020-07-06 19:17:37 +0000
commitf3c674b0f3d25c8def2e0d0338af099086778650 (patch)
tree9bf6c048f8ac3564e31c3cc236f7c3e68a100e80
parent0ad78b2e0e1b1a73f37d095dae863d457e36af89 (diff)
parent1e5b0a973293d9a6bf7b60349763ee3e71343dea (diff)
Merge release-20200622.1-66-g1e5b0a973 (automated)
-rw-r--r--pkg/abi/linux/linux_abi_autogen_unsafe.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/abi/linux/linux_abi_autogen_unsafe.go b/pkg/abi/linux/linux_abi_autogen_unsafe.go
index 3f3af78bb..80878b079 100644
--- a/pkg/abi/linux/linux_abi_autogen_unsafe.go
+++ b/pkg/abi/linux/linux_abi_autogen_unsafe.go
@@ -138,7 +138,7 @@ func (s *Statx) MarshalUnsafe(dst []byte) {
// UnmarshalUnsafe implements marshal.Marshallable.UnmarshalUnsafe.
func (s *Statx) UnmarshalUnsafe(src []byte) {
- if s.Btime.Packed() && s.Ctime.Packed() && s.Mtime.Packed() && s.Atime.Packed() {
+ if s.Atime.Packed() && s.Btime.Packed() && s.Ctime.Packed() && s.Mtime.Packed() {
safecopy.CopyOut(unsafe.Pointer(s), src)
} else {
s.UnmarshalBytes(src)